From 9a8c25937bfac8242b7eef9f3f815a273392606a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 29 Aug 2006 21:45:41 +0200 Subject: * DistUpgrade/*: - more useful error reporting, includes advice about the file that are required to add to the bugreport (/var/log/dist-upgrade/*) --- DistUpgrade/DistUpgradeCache.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'DistUpgrade/DistUpgradeCache.py') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index bd9b00df..455ef34f 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -159,8 +159,10 @@ class MyCache(apt.Cache): # FIXME: change the text to something more useful view.error(_("Could not calculate the upgrade"), _("A unresolvable problem occured while " - "calculating the upgrade. Please report " - "this as a bug. ")) + "calculating the upgrade.\n\n" + "Please report this bug against the 'update-manager' " + "package and include the files in /var/log/dist-upgrade/ " + "in the bugreport.")) logging.error("Dist-upgrade failed: '%s'", e) return False -- cgit v1.2.3 From ab901030dbec4180254a680dd1c49016cfc36d4a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 29 Aug 2006 23:11:17 +0200 Subject: * DistUpgrade/*: - added download time estimation (based on modem and 1Mbit DSL) --- DistUpgrade/DistUpgradeCache.py | 10 ++++++++++ DistUpgrade/DistUpgradeControler.py | 2 +- DistUpgrade/DistUpgradeView.py | 11 +++++++++++ DistUpgrade/DistUpgradeViewGtk.py | 19 +++---------------- 4 files changed, 25 insertions(+), 17 deletions(-) (limited to 'DistUpgrade/DistUpgradeCache.py') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 455ef34f..e1f892ac 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -8,6 +8,7 @@ import re import logging from gettext import gettext as _ from DistUpgradeConfigParser import DistUpgradeConfig +from DistUpgradeView import FuzzyTimeToStr class MyCache(apt.Cache): # init @@ -35,6 +36,15 @@ class MyCache(apt.Cache): pm.GetArchives(fetcher, self._list, self._records) return fetcher.FetchNeeded @property + def estimatedDownloadTime(self): + """ get the estimated download time """ + requiredDownload = self.requiredDownload + timeModem = requiredDownload/(56*1024/8) # 56 kbit + timeDSL = requiredDownload/(1024*1024/8) # 1Mbit = 1024 kbit + s= _("The download will approximately take %s with a 56k modem and %s with " + "a 1Mbit DSL connection" % FuzzyTimeToStr(timeModem), FuzzyTimeToStr(timeDSL)) + return s + @property def additionalRequiredSpace(self): """ get the size of the additonal required space on the fs """ return self._depcache.UsrSize diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 689882ac..cb0835fb 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -132,7 +132,7 @@ class DistUpgradeControler(object): _("The upgrade can use the network to check " "the latest updates and to fetch packages that are not on the " "current CD.\n" - "If you have inexpensive network access you should answer " + "If you have fast or inexpensive network access you should answer " "'Yes' here. If networking is expensive for you choose 'No'.") ) self.useNetwork = res diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 4b24ee7f..6d6d5516 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -19,6 +19,17 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA +def FuzzyTimeToStr(sec): + " return the time a bit fuzzy (no seconds if time > 60 secs " + if sec > 60*60*24: + return _("%li days %li hours %li minutes") % (sec/60/60/24, (sec/60/60) % 24, (sec/60) % 60) + if sec > 60*60: + return _("%li hours %li minutes") % (sec/60/60, (sec/60) % 60) + if sec > 60: + return _("%li minutes") % (sec/60) + return _("%li seconds") % sec + + class DumbTerminal(object): def call(self, cmd): " expects a command in the subprocess style (as a list) " diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index fb774c5a..bb2e63e2 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -37,7 +37,7 @@ import apt_pkg import os from apt.progress import InstallProgress -from DistUpgradeView import DistUpgradeView +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp, bindtextdomain import gettext @@ -46,19 +46,6 @@ from gettext import gettext as _ def utf8(str): return unicode(str, 'latin1').encode('utf-8') -def FuzzyTimeToStr(sec): - " return the time a bit fuzzy (no seconds if time > 60 secs " - if sec > 60*60*24: - return _("About %li days %li hours %li minutes remaining") % (sec/60/60/24, - (sec/60/60) % 24, - (sec/60) % 60) - if sec > 60*60: - return _("About %li hours %li minutes remaining") % (sec/60/60, - (sec/60) % 60) - if sec > 60: - return _("About %li minutes remaining") % (sec/60) - return _("About %li seconds remaining") % sec - class GtkCdromProgressAdapter(apt.progress.CdromProgress): """ Report the cdrom add progress @@ -140,7 +127,7 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress): if self.currentCPS > 0: self.status.set_text(_("Fetching file %li of %li at %s/s" % (currentItem, self.totalItems, apt_pkg.SizeToStr(self.currentCPS)))) - self.progress.set_text(FuzzyTimeToStr(self.eta)) + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr(self.eta)) else: self.status.set_text(_("Fetching file %li of %li" % (currentItem, self.totalItems))) self.progress.set_text(" ") @@ -262,7 +249,7 @@ class GtkInstallProgressAdapter(InstallProgress): eta = (100.0 - self.percent) * time_per_percent # only show if we have some sensible data if eta > 61.0 and eta < (60*60*24*2): - self.progress.set_text(FuzzyTimeToStr(eta)) + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr(eta)) else: self.progress.set_text(" ") -- cgit v1.2.3 From c9d03a8a633afd3b6a17b985bc640d59c6889a45 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 29 Aug 2006 23:13:39 +0200 Subject: * DistUpgrade/ - actually show the estiamted download time --- DistUpgrade/DistUpgradeCache.py | 9 --------- DistUpgrade/DistUpgradeView.py | 9 +++++++++ DistUpgrade/DistUpgradeViewGtk.py | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'DistUpgrade/DistUpgradeCache.py') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index e1f892ac..37dd96db 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -36,15 +36,6 @@ class MyCache(apt.Cache): pm.GetArchives(fetcher, self._list, self._records) return fetcher.FetchNeeded @property - def estimatedDownloadTime(self): - """ get the estimated download time """ - requiredDownload = self.requiredDownload - timeModem = requiredDownload/(56*1024/8) # 56 kbit - timeDSL = requiredDownload/(1024*1024/8) # 1Mbit = 1024 kbit - s= _("The download will approximately take %s with a 56k modem and %s with " - "a 1Mbit DSL connection" % FuzzyTimeToStr(timeModem), FuzzyTimeToStr(timeDSL)) - return s - @property def additionalRequiredSpace(self): """ get the size of the additonal required space on the fs """ return self._depcache.UsrSize diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 6d6d5516..a42d2b8f 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -29,6 +29,15 @@ def FuzzyTimeToStr(sec): return _("%li minutes") % (sec/60) return _("%li seconds") % sec +def estimatedDownloadTime(self, size): + """ get the estimated download time """ + requiredDownload = self.requiredDownload + timeModem = requiredDownload/(56*1024/8) # 56 kbit + timeDSL = requiredDownload/(1024*1024/8) # 1Mbit = 1024 kbit + s= _("The download will approximately take %s with a 56k modem and %s with " + "a 1Mbit DSL connection" % FuzzyTimeToStr(timeModem), FuzzyTimeToStr(timeDSL)) + return s + class DumbTerminal(object): def call(self, cmd): diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index bb2e63e2..90d1e157 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -37,7 +37,7 @@ import apt_pkg import os from apt.progress import InstallProgress -from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, estimatedDownloadTime from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp, bindtextdomain import gettext @@ -476,6 +476,7 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): if downloadSize > 0: msg += _("You have to download a total of %s." %\ apt_pkg.SizeToStr(downloadSize)) + msg += estimatedDownloadTime(downloadSize) if (pkgs_upgrade + pkgs_inst + pkgs_remove) > 100: msg += "\n\n%s" % _("The upgrade can take several hours and "\ -- cgit v1.2.3 From e655589f378d67eb14d7547dd97d56d857cf938c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Sep 2006 10:58:41 +0200 Subject: * DistUpgrade/DistUpgradeCache.py, DistUpgrade.cfg, README: - added "RemoveEssentialOk" to control if certain essential package are removed --- DistUpgrade/DistUpgrade.cfg | 1 + DistUpgrade/DistUpgradeCache.py | 4 +++- DistUpgrade/README | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'DistUpgrade/DistUpgradeCache.py') diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index f063840d..02a77564 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -9,6 +9,7 @@ MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop BaseMetaPkgs=ubuntu-minimal PostUpgradePurge=xorg-common, libgl1-mesa Demotions=demoted.cfg +RemoveEssentialOk=sysvinit # information about the individual meta-pkgs [ubuntu-desktop] diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 37dd96db..1f53b6be 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -197,11 +197,13 @@ class MyCache(apt.Cache): """ this function tests if the current changes don't violate our constrains (blacklisted removals etc) """ + removeEssentialOk = self.config.getlist("Distro","RemoveEssentialOk") for pkg in self.getChanges(): if pkg.markedDelete and self._inRemovalBlacklist(pkg.name): logging.debug("The package '%s' is marked for removal but it's in the removal blacklist", pkg.name) return False - if pkg.markedDelete and pkg._pkg.Essential == True: + if pkg.markedDelete and (pkg._pkg.Essential == True and + not pkg.name in removeEssentialOk): logging.debug("The package '%s' is marked for removal but it's a ESSENTIAL package", pkg.name) return False return True diff --git a/DistUpgrade/README b/DistUpgrade/README index 9d408f43..60c761d6 100644 --- a/DistUpgrade/README +++ b/DistUpgrade/README @@ -30,6 +30,8 @@ PostUpgrade{Install,Remove,Purge}: 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 [$meta-pkg] KeyDependencies: -- cgit v1.2.3 From 0704ed7155433750011e128550a8fb55d94121c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Sep 2006 13:18:47 +0200 Subject: * DistUpgrade/forced_obsoletes.txt: - no longer needed, part of DistUpgrade.cfg now * DistUpgrade/mirrors.txt, DistUpgrade/removal_blacklist.txt: - renamed for consitency * DistUpgrade/DistUpgrade.cfg, DistUpgrade/DistUpgradeCache.py: - added "RemovalBlacklistFile" instead of hardcoding it * DistUpgrade/DistUpgradeConfigParser.py: - added "datadir" to constructor * DistUpgrade/DistUpgradeControler.py: - added datadir * DistUpgrade/DistUpgradeView.py: - added "hideStep()" method - added STEP_PREPARE, STEP_MODIFY_SOURCES, STEP_FETCH_INSTALL, STEP_CLEANUP, STEP_REBOOT * DistUpgrade/DistUpgradeViewGtk.py: - implemendted hideStep() - added datadir arguemnt for constructor * dist-upgrade.py - run it with the "." as arguemnt for the config * UpdateManager/UpdateManager.py: - if it can't be updated, ask about a dist-upgrade instead * update-manager. - added --dist-upgrade * po/*.po - make update-po --- DistUpgrade/DistUpgrade.cfg | 3 +- DistUpgrade/DistUpgradeCache.py | 10 +- DistUpgrade/DistUpgradeConfigParser.py | 7 +- DistUpgrade/DistUpgradeControler.py | 21 ++- DistUpgrade/DistUpgradeView.py | 11 +- DistUpgrade/DistUpgradeViewGtk.py | 18 ++- DistUpgrade/dist-upgrade.py | 2 +- DistUpgrade/forced_obsoletes.txt | 1 - DistUpgrade/mirrors.cfg | 282 +++++++++++++++++++++++++++++++++ DistUpgrade/mirrors.txt | 282 --------------------------------- DistUpgrade/removal_blacklist.cfg | 8 + DistUpgrade/removal_blacklist.txt | 8 - UpdateManager/UpdateManager.py | 45 +++--- po/ar.po | 233 +++++++++++++-------------- po/bg.po | 251 +++++++++++++++-------------- po/bn.po | 239 ++++++++++++++-------------- po/br.po | 233 +++++++++++++-------------- po/ca.po | 253 +++++++++++++++-------------- po/cs.po | 237 +++++++++++++-------------- po/da.po | 252 +++++++++++++++-------------- po/de.po | 253 +++++++++++++++-------------- po/el.po | 253 +++++++++++++++-------------- po/en_AU.po | 251 +++++++++++++++-------------- po/en_CA.po | 239 ++++++++++++++-------------- po/en_GB.po | 239 ++++++++++++++-------------- po/es.po | 253 +++++++++++++++-------------- po/fi.po | 251 +++++++++++++++-------------- po/fr.po | 254 +++++++++++++++-------------- po/fur.po | 233 +++++++++++++-------------- po/gl.po | 234 +++++++++++++-------------- po/he.po | 234 +++++++++++++-------------- po/hi.po | 233 +++++++++++++-------------- po/hr.po | 253 +++++++++++++++-------------- po/hu.po | 253 +++++++++++++++-------------- po/id.po | 253 +++++++++++++++-------------- po/it.po | 253 +++++++++++++++-------------- po/ja.po | 253 +++++++++++++++-------------- po/ka.po | 248 +++++++++++++++-------------- po/ko.po | 252 +++++++++++++++-------------- po/ku.po | 234 +++++++++++++-------------- po/lt.po | 253 +++++++++++++++-------------- po/mk.po | 234 +++++++++++++-------------- po/ms.po | 236 +++++++++++++-------------- po/nb.po | 253 +++++++++++++++-------------- po/ne.po | 239 ++++++++++++++-------------- po/nl.po | 254 +++++++++++++++-------------- po/no.po | 239 ++++++++++++++-------------- po/oc.po | 233 +++++++++++++-------------- po/pa.po | 233 +++++++++++++-------------- po/pl.po | 253 +++++++++++++++-------------- po/pt.po | 251 +++++++++++++++-------------- po/pt_BR.po | 253 +++++++++++++++-------------- po/ro.po | 234 +++++++++++++-------------- po/ru.po | 252 +++++++++++++++-------------- po/rw.po | 238 ++++++++++++++-------------- po/sk.po | 253 +++++++++++++++-------------- po/sr.po | 233 +++++++++++++-------------- po/sv.po | 253 +++++++++++++++-------------- po/th.po | 251 +++++++++++++++-------------- po/tr.po | 234 +++++++++++++-------------- po/uk.po | 234 +++++++++++++-------------- po/update-manager.pot | 233 +++++++++++++-------------- po/ur.po | 233 +++++++++++++-------------- po/urd.po | 233 +++++++++++++-------------- po/vi.po | 234 +++++++++++++-------------- po/xh.po | 233 +++++++++++++-------------- po/zh_CN.po | 249 +++++++++++++++-------------- po/zh_HK.po | 234 +++++++++++++-------------- po/zh_TW.po | 249 +++++++++++++++-------------- setup.py | 1 + update-manager | 25 ++- 71 files changed, 7445 insertions(+), 6914 deletions(-) delete mode 100644 DistUpgrade/forced_obsoletes.txt create mode 100644 DistUpgrade/mirrors.cfg delete mode 100644 DistUpgrade/mirrors.txt create mode 100644 DistUpgrade/removal_blacklist.cfg delete mode 100644 DistUpgrade/removal_blacklist.txt (limited to 'DistUpgrade/DistUpgradeCache.py') diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index 02a77564..7a8ebba9 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -10,6 +10,7 @@ BaseMetaPkgs=ubuntu-minimal PostUpgradePurge=xorg-common, libgl1-mesa Demotions=demoted.cfg RemoveEssentialOk=sysvinit +RemovalBlacklistFile=removal_blacklist.cfg # information about the individual meta-pkgs [ubuntu-desktop] @@ -36,7 +37,7 @@ BackupExt=distUpgrade From=dapper To=edgy ValidOrigin=Ubuntu -ValidMirrors = mirrors.txt +ValidMirrors = mirrors.cfg [Network] MaxRetries=3 \ No newline at end of file diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 1f53b6be..680e7d9e 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -12,20 +12,16 @@ from DistUpgradeView import FuzzyTimeToStr class MyCache(apt.Cache): # init - def __init__(self, progress=None): + def __init__(self, config, progress=None): apt.Cache.__init__(self, progress) self.to_install = [] self.to_remove = [] - self.config = DistUpgradeConfig() + self.config = config self.metapkgs = self.config.getlist("Distro","MetaPkgs") # a list of regexp that are not allowed to be removed - self.removal_blacklist = [] - for line in open("removal_blacklist.txt").readlines(): - line = line.strip() - if not line == "" or line.startswith("#"): - self.removal_blacklist.append(line) + self.removal_blacklist = config.getListFromFile("Distro","RemovalBlacklistFile") # properties @property diff --git a/DistUpgrade/DistUpgradeConfigParser.py b/DistUpgrade/DistUpgradeConfigParser.py index a4c55080..6879dfda 100644 --- a/DistUpgrade/DistUpgradeConfigParser.py +++ b/DistUpgrade/DistUpgradeConfigParser.py @@ -2,9 +2,10 @@ from ConfigParser import ConfigParser, NoOptionError class DistUpgradeConfig(ConfigParser): - def __init__(self): + def __init__(self, datadir): ConfigParser.__init__(self) - self.read(['DistUpgrade.cfg']) + self.datadir=datadir + self.read([datadir+'/DistUpgrade.cfg']) def getlist(self, section, option): try: tmp = self.get(section, option) @@ -17,7 +18,7 @@ class DistUpgradeConfig(ConfigParser): filename = self.get(section, option) except NoOptionError: return [] - items = [x.strip() for x in open(filename)] + items = [x.strip() for x in open(self.datadir+"/"+filename)] return filter(lambda s: not s.startswith("#") and not s == "", items) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 13050f49..a51fa485 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -86,10 +86,20 @@ class AptCdrom(object): class DistUpgradeControler(object): """ this is the controler that does most of the work """ - def __init__(self, distUpgradeView, cdromPath=None): - gettext.bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo")) + def __init__(self, distUpgradeView, cdromPath=None, datadir=None): + # setup the pathes + localedir = "/usr/share/locale/update-manager/" + if datadir == None: + datadir = os.getcwd() + localedir = os.path.join(datadir,"mo") + gladedir = datadir + self.datadir = datadir + + # init gettext + gettext.bindtextdomain("update-manager",localedir) gettext.textdomain("update-manager") + # setup the view self._view = distUpgradeView self._view.updateStatus(_("Reading cache")) self.cache = None @@ -98,8 +108,8 @@ class DistUpgradeControler(object): self.aptcdrom = AptCdrom(distUpgradeView, cdromPath) self.useNetwork = True - # the configuration - self.config = DistUpgradeConfig() + # the configuration + self.config = DistUpgradeConfig(datadir) self.sources_backup_ext = "."+self.config.get("Files","BackupExt") # some constants here @@ -113,13 +123,14 @@ class DistUpgradeControler(object): # turn on debuging in the cache apt_pkg.Config.Set("Debug::pkgProblemResolver","true") apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","true") + # FIXME: make this "append"? fd = os.open("/var/log/dist-upgrade/apt.log", os.O_RDWR|os.O_CREAT|os.O_TRUNC, 0644) os.dup2(fd,1) os.dup2(fd,2) def openCache(self): - self.cache = MyCache(self._view.getOpCacheProgress()) + self.cache = MyCache(self.config, self._view.getOpCacheProgress()) def prepare(self): """ initial cache opening, sanity checking, network checking """ diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 27817b13..9fda83d4 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -44,7 +44,13 @@ class DumbTerminal(object): def call(self, cmd): " expects a command in the subprocess style (as a list) " subprocess.call(cmd) - + + +(STEP_PREPARE, + STEP_MODIFY_SOURCES, + STEP_FETCH_INSTALL, + STEP_CLEANUP, + STEP_REBOOT) = range(1,6) class DistUpgradeView(object): " abstraction for the upgrade view " @@ -75,6 +81,9 @@ class DistUpgradeView(object): 5. Complete """ pass + def hideStep(self, step): + " hide a certain step from the GUI " + pass def confirmChanges(self, summary, changes, downloadSize, actions=None): """ display the list of changed packages (apt.Package) and return if the user confirms them diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index c58c1fcc..73440f3e 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -303,17 +303,24 @@ class DistUpgradeVteTerminal(object): class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): " gtk frontend of the distUpgrade tool " - def __init__(self): + def __init__(self, datadir=None): + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + gladedir=os.getcwd() + else: + localedir="/usr/share/locale/update-manager" + gladedir=os.path.join(datadir, "glade") + # FIXME: i18n must be somewhere relative do this dir try: - bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo")) + bindtextdomain("update-manager", localedir) gettext.textdomain("update-manager") except Exception, e: logging.warning("Error setting locales (%s)" % e) icons = gtk.icon_theme_get_default() gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) - SimpleGladeApp.__init__(self, "DistUpgrade.glade", + SimpleGladeApp.__init__(self, gladedir+"/DistUpgrade.glade", None, domain="update-manager") # we dont use this currently #self.window_main.set_keep_above(True) @@ -398,6 +405,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): 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) + image.hide() + label.hide() def setStep(self, step): # first update the "last" step as completed size = gtk.ICON_SIZE_MENU diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py index c7a2a7b7..07320fb9 100755 --- a/DistUpgrade/dist-upgrade.py +++ b/DistUpgrade/dist-upgrade.py @@ -21,7 +21,7 @@ if __name__ == "__main__": format='%(asctime)s %(levelname)s %(message)s', filemode='w') - config = DistUpgradeConfig() + config = DistUpgradeConfig(".") requested_view= config.get("View","View") try: view_modul = __import__(requested_view) diff --git a/DistUpgrade/forced_obsoletes.txt b/DistUpgrade/forced_obsoletes.txt deleted file mode 100644 index 1941b867..00000000 --- a/DistUpgrade/forced_obsoletes.txt +++ /dev/null @@ -1 +0,0 @@ -xscreensaver diff --git a/DistUpgrade/mirrors.cfg b/DistUpgrade/mirrors.cfg new file mode 100644 index 00000000..7ab0826c --- /dev/null +++ b/DistUpgrade/mirrors.cfg @@ -0,0 +1,282 @@ +#ubuntu +http://archive.ubuntu.com/ubuntu +http://security.ubuntu.com/ubuntu +ftp://archive.ubuntu.com/ubuntu +ftp://security.ubuntu.com/ubuntu + +##===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(InternodeCustomersonly) +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/(slow) +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/(Movedtohttp://nl.archive.ubuntu.com/ubuntu/) +http://ubuntu.synssans.nl +ftp://ftp.bit.nl/ubuntu/(Movedtoftp://nl.archive.ubuntu.com/ubuntu/) +rsync://ftp.bit.nl/ubuntu/(Movedtorsync://nl.archive.ubuntu.com/ubuntu/) + +#===NewZealand=== +ftp://ftp.citylink.co.nz/ubuntu/(maynotbeaccessibleoutsideof.nz) + +#===Nicaragua=== +http://www.computacion.uni.edu.ni/iso/ubuntu/ + +#===Norway=== +http://mirror.trivini.no/ubuntu(Movedtohttp://no.archive.ubuntu.com/ubuntu/) +ftp://mirror.trivini.no/ubuntu(Movedtoftp://no.archive.ubuntu.com/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/(fullmirror) +ftp://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/(fullmirror) +rsync://ftp.iasi.roedu.net/ubuntu/(fullmirror) +http://ftp.lug.ro/ubuntu/(i386andamd64) +ftp://ftp.lug.ro/ubuntu/(i386andamd64) + +#===Russia=== +http://debian.nsu.ru/ubuntu/(i386andamd64) +ftp://debian.nsu.ru/ubuntu/(i386andamd64) + +#===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/(i386) +ftp://godel.cs.bilgi.edu.tr/ubuntu/(i386) + +#===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/ + diff --git a/DistUpgrade/mirrors.txt b/DistUpgrade/mirrors.txt deleted file mode 100644 index 7ab0826c..00000000 --- a/DistUpgrade/mirrors.txt +++ /dev/null @@ -1,282 +0,0 @@ -#ubuntu -http://archive.ubuntu.com/ubuntu -http://security.ubuntu.com/ubuntu -ftp://archive.ubuntu.com/ubuntu -ftp://security.ubuntu.com/ubuntu - -##===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(InternodeCustomersonly) -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/(slow) -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/(Movedtohttp://nl.archive.ubuntu.com/ubuntu/) -http://ubuntu.synssans.nl -ftp://ftp.bit.nl/ubuntu/(Movedtoftp://nl.archive.ubuntu.com/ubuntu/) -rsync://ftp.bit.nl/ubuntu/(Movedtorsync://nl.archive.ubuntu.com/ubuntu/) - -#===NewZealand=== -ftp://ftp.citylink.co.nz/ubuntu/(maynotbeaccessibleoutsideof.nz) - -#===Nicaragua=== -http://www.computacion.uni.edu.ni/iso/ubuntu/ - -#===Norway=== -http://mirror.trivini.no/ubuntu(Movedtohttp://no.archive.ubuntu.com/ubuntu/) -ftp://mirror.trivini.no/ubuntu(Movedtoftp://no.archive.ubuntu.com/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/(fullmirror) -ftp://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/(fullmirror) -rsync://ftp.iasi.roedu.net/ubuntu/(fullmirror) -http://ftp.lug.ro/ubuntu/(i386andamd64) -ftp://ftp.lug.ro/ubuntu/(i386andamd64) - -#===Russia=== -http://debian.nsu.ru/ubuntu/(i386andamd64) -ftp://debian.nsu.ru/ubuntu/(i386andamd64) - -#===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/(i386) -ftp://godel.cs.bilgi.edu.tr/ubuntu/(i386) - -#===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/ - diff --git a/DistUpgrade/removal_blacklist.cfg b/DistUpgrade/removal_blacklist.cfg new file mode 100644 index 00000000..773395be --- /dev/null +++ b/DistUpgrade/removal_blacklist.cfg @@ -0,0 +1,8 @@ +# blacklist of packages that should never be removed +ubuntu-base +ubuntu-desktop +kubuntu-destkop +edubuntu-desktop +linux-image-.* +linux-restricted-.* +nvidia-glx.* diff --git a/DistUpgrade/removal_blacklist.txt b/DistUpgrade/removal_blacklist.txt deleted file mode 100644 index 773395be..00000000 --- a/DistUpgrade/removal_blacklist.txt +++ /dev/null @@ -1,8 +0,0 @@ -# blacklist of packages that should never be removed -ubuntu-base -ubuntu-desktop -kubuntu-destkop -edubuntu-desktop -linux-image-.* -linux-restricted-.* -nvidia-glx.* diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 3e958db0..240c2471 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -261,37 +261,30 @@ class UpdateList: # check if we have held-back something if cache._depcache.KeepCount > 0: - #print "WARNING, keeping packages" + keepcount = cache._depcache.KeepCount msg = ("%s\n\n%s" % \ (_("Cannot install all available updates"), - _("Some updates require the removal of further software. " - "Use the function \"Mark All Upgrades\" of the package manager " - "\"Synaptic\" or run \"sudo apt-get dist-upgrade\" in a " - "terminal to update your system completely."))) - dialog = gtk.MessageDialog(self.parent_window, 0, gtk.MESSAGE_INFO, - gtk.BUTTONS_CLOSE,"") - dialog.set_default_response(gtk.RESPONSE_OK) + _("Some of the updates require more extensive changes " + "than expected.\n\n" + "This usually means that you have enabled unoffical " + "repositories, that it is not " + "fully upgraded from the last distribution release or " + "that you run a development release " + "of the distribution.\n\n" + "Would you like to perform a full distribution upgrade " + "now?"))) + dialog = gtk.MessageDialog(self.parent_window, 0, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_YES_NO,"") + dialog.set_default_response(gtk.RESPONSE_NO) dialog.set_markup(msg) dialog.set_title("") dialog.vbox.set_spacing(6) - label = gtk.Label(_("The following updates will be skipped:")) - label.set_alignment(0.0,0.5) - dialog.set_border_width(6) - label.show() - dialog.vbox.pack_start(label) - scroll = gtk.ScrolledWindow() - scroll.set_size_request(-1,200) - scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - text = gtk.TextView() - text.set_editable(False) - text.set_cursor_visible(False) - buf = text.get_buffer() - held_back.sort() - buf.set_text("\n".join(held_back)) - scroll.add(text) - dialog.vbox.pack_start(scroll) - scroll.show_all() - dialog.run() + res = dialog.run() + if res == gtk.RESPONSE_YES: + os.execl("/usr/bin/gksu", + "/usr/bin/gksu", + "/usr/bin/update-manager --dist-upgrade") dialog.destroy() diff --git a/po/ar.po b/po/ar.po index 14eea409..63d4fa85 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi \n" "Language-Team: Arabic \n" @@ -80,45 +80,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "خطاء في استيراد الملف" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "خطاء في ازالة المفتاح" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -126,38 +126,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "الرجاء ادخال اسم القرص" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "الرجاء ادخال القرص في الجهاز" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -166,34 +166,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -216,15 +216,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "قراءة من الكاش" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -232,11 +232,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -249,11 +249,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -262,42 +262,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "importing" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "مصدر الطرف الثالث غير مفعل" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "خطاء خلال التحديث" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "لا يوجد مساحة كافية على القرص الصلب" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -306,15 +306,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "هل تريد البدء في عملية التحديث الان؟" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -323,21 +323,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -346,49 +346,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -398,19 +398,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -470,11 +470,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -484,7 +484,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -492,7 +492,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -500,7 +500,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -508,7 +508,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -516,74 +516,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -798,73 +798,71 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -872,52 +870,52 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1350,6 +1348,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1387,7 +1390,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/bg.po b/po/bg.po index 70414c36..e41fb871 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" @@ -80,50 +80,50 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Обновления на софтуера" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Изходен код" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Изходен код" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Внасяне на ключ" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Грешка при внасяне на избрания файл" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Избраният файл или не е GPG файл, или е повреден." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Грешка при премахване на ключа" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключът, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -134,19 +134,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Моля, въведете име за диска" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Моля, поставете диск в устройството:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Повредени пакети" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -155,20 +155,20 @@ msgstr "" "този софтуер. Моля, поправете ги със synaptic или apt-get преди да " "продължите!" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Не може да бъдат надградени изисквани мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Ще трябва да бъде премахнат важен пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Не може да бъде планирано надграждането" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -180,11 +180,11 @@ msgstr "" "това като грешка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Грешка при удостоверяването автентичността на някои пакети" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -194,12 +194,12 @@ msgstr "" "да е временен проблем с мрежата. Може би бихте искали да опитате отново по-" "късно. Вижте по-долу списъка на неудоствоерените пакети." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Не може да се инсталира '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -208,11 +208,11 @@ msgstr "" "грешка! " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Не могат да бъдат предположени мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -240,15 +240,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Четене на кеша" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -256,11 +256,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Не е открит валиден огледален сървър" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -280,11 +280,11 @@ msgstr "" "Ако изберете \"Не\", актуализирането ще бъде отменено." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Генериране на източници по подразбиране?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -298,11 +298,11 @@ msgstr "" "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", " "актуализацията ще бъде отменена." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Информацията от хранилището е невалидна" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -310,11 +310,11 @@ msgstr "" "Надграждане на информацията от хранилището доведе до невалиден файл. Моля, " "съобщете това като грешка!" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Забранени са източници от трети страни" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -324,11 +324,11 @@ msgstr "" "Можете да ги разрешите отново след надграждането чрез инструмента software-" "properties или чрез synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Грешка по време на надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -336,11 +336,11 @@ msgstr "" "Възникна проблем при актуализацията. Това обикновено е накакъв проблем с " "мрежата. Моля, проверете мрежовата връзка и опитайте пак!" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Недостатъчно свободно място на диска" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -349,15 +349,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Желаете ли да започне надграждането?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Не можеше да бъдат инсталирани надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -369,11 +369,11 @@ msgstr "" "Надграждането сега ще бъде прекратено. Системата Ви може да е в " "неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Не можеше да бъдат свалени надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -381,11 +381,11 @@ msgstr "" "Надграждането се прекратява. Моля, проверете Интернет връзката или " "инсталационния носител и опитайте отново! " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -394,23 +394,23 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Премахване на остарелите пакети?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "П_рескачане на стъпката" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Премахване" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Грешка при прехвърляне" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -419,27 +419,27 @@ msgstr "" "информация! " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Рестартиране на системата" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Проверка на диспечера на пакети" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Актуализиране информацията от хранилището" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 #, fuzzy msgid "Invalid package information" msgstr "Невалидна информация за пакет" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -452,19 +452,19 @@ msgstr "" "бъде открит.\n" "Това показва сериозна грешка. Моля, съобщете за това!" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Запитване за потвърждение" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Търсене на остарял софтуер" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Надграждането на системата завърши." @@ -527,11 +527,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Командата \"diff\" не бе намерена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Възникна фатална грешка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -547,28 +547,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Пакетът %s ще бъде премахнат." msgstr[1] "Пакетите %s ще бъдат премахнати." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s нов пакет ще бъде инсталиран." msgstr[1] "%s нови пакети ще бъдат инталирани." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s пакет ще бъде надграден." msgstr[1] "%s нови пакети ще бъдат надградени." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -576,7 +576,7 @@ msgid "" "You have to download a total of %s. " msgstr "Трябва да изтеглите данни общо %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -585,70 +585,70 @@ msgstr "" "Надграждането може да отнеме няколко часа, като не може да бъде отменено по-" "нататък." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "За да предодвратите загуба на данни, затворете всички отворени приложения и " "документи." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Не можеше да бъдат намерени надграждания" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Системата Ви вече е надградена." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Премахване на %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Инсталиране на %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Надграждане на %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Нужно е рестартиране" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Надграждането е завършено и има нужда от рестарт. Рестартиране сега?" @@ -888,112 +888,106 @@ msgstr "Надграждане до последната версия на Ubunt msgid "Other updates" msgstr "_Инсталиране на актуализациите" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Не могат да бъдат инсталирани всички актуализации" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Някои актуализации изискват премахването на допълнителен софтуер. " -"Използвайте функцията „Маркиране на всички актуализации” на Диспечера на " -"пакети „Synaptic” или задействайте „sudo apt-get dist-upgrade” в терминален " -"прозорец, за да актуализирате напълно системата си." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Следните актуализации ще бъдат пропуснати:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Сваляне на списъка с промени..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Размер за изтегляне: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Системата Ви е актуална" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Можете да инсталирате %s актуализация" msgstr[1] "Можете да инсталирате %s актуализации" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Моля, изчакайте! Това може да отнеме известно време." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Актуализацията е завършена" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Нова версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуция вече не се поддържа" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1003,17 +997,17 @@ msgstr "" "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com " "за повече информация за надграждането!" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Индексът на софтуера е повреден" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1505,6 +1499,12 @@ msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Официално поддържан" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1548,7 +1548,7 @@ msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Официално поддържан" #. CompDescription @@ -1618,6 +1618,19 @@ msgstr "DFSG-съвместим софтуер с несвободни зави msgid "Non-DFSG-compatible Software" msgstr "Софтуер несъвместим с DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Някои актуализации изискват премахването на допълнителен софтуер. " +#~ "Използвайте функцията „Маркиране на всички актуализации” на Диспечера на " +#~ "пакети „Synaptic” или задействайте „sudo apt-get dist-upgrade” в " +#~ "терминален прозорец, за да актуализирате напълно системата си." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Следните актуализации ще бъдат пропуснати:" + #~ msgid "Download is complete" #~ msgstr "Свалянето е завършено" diff --git a/po/bn.po b/po/bn.po index 9d645556..eb93ec84 100644 --- a/po/bn.po +++ b/po/bn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" @@ -80,46 +80,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "সফ্টওয়্যার আপডেট" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "কী ইম্পোর্ট" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "নির্বাচিত ফাইলটি ইম্পোর্ট করতে সমস্যা হয়েছে" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "বেছে নেয়া ফাইলটি মনে হয় কোন GPG কী ফাইল নয় অথবা এটি নষ্ট।" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "কী সরাতে সমস্যা হয়েছে" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -130,38 +130,38 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "ডিস্কের জন্য একটি নাম দিন" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "ভাঙা প্যাকেজসমূহ" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "আপগ্রেড গণনা করতে পারছে না" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -170,23 +170,23 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "'%s' ইন্সটল করা যাচ্ছে না" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -195,11 +195,11 @@ msgstr "" "রিপোর্ট করুন। " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "meta-package অনুমান করা যাচ্ছ না" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -223,15 +223,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "ক্যাশ পড়া হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -239,11 +239,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "কোন সঠিক মিরর পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -256,11 +256,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "ডিফল্ট sources তৈরি করে?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -274,11 +274,11 @@ msgstr "" "'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট বাতিল " "হবে।" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "রিপোজিটরির তথ্য সঠিক নয়" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -286,22 +286,22 @@ msgstr "" "রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ " "হিসাবে রিপোর্ট করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "আপগ্রেড করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -309,11 +309,11 @@ msgstr "" "আপগ্রেড করার সময় একটি সমস্যা হয়েছে। এটি সাধারনত নেটওয়ার্কের সমস্যা, অনুগ্রহ করে " "আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -322,15 +322,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "আপনি কি আপগ্রেড শুরু করতে চান?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "আপগ্রেড ইন্সটল করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -339,11 +339,11 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "আপগ্রেড ডাউনলোড করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -351,11 +351,11 @@ msgstr "" "আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া পরীক্ষা " "করুন এবং আবার চেষ্টা করুন। " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -364,49 +364,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "এই ধাপটি এড়িয়ে যাও (_এ)" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "সরাও (_স)" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "প্রেরণ করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "সিস্টেমটি রিস্টার্ট করছি" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "ভুল প্যাকেজ তথ্য" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -416,19 +416,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "তথ্যের জন্য জিজ্ঞাসা" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "আপগ্রেড করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "সিস্টেম আপগ্রেড সম্পন্ন।" @@ -491,11 +491,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "'diff' কমান্ডটি পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -505,28 +505,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s টি প্যাকেজ মোছা হবে।" msgstr[1] "%s টি প্যাকেজ মোছা হবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -534,75 +534,75 @@ msgid "" "You have to download a total of %s. " msgstr "আপনাকে সর্বমোট %s ডাউনলোড করতে হবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "কোন আপগ্রেড পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "%s মুছো" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "%s ইন্সটল" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "%s আপগ্রেড" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "%li দিন %li ঘন্টা %li মিিনিট বাকি আছে" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "%li ঘন্টা %li মিিনিট বাকি আছে" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "রিবুট করা প্রয়োজন" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?" @@ -829,125 +829,123 @@ msgstr "উবুন্টু এর সর্বশেষ ভার্সনে msgid "Other updates" msgstr "আপডেট ইন্সটল করো (_I)" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "ভার্সন %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "ডাউনলোড এর আকার: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "আপনার সিস্টেম আপ-টু-ডেট" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন" msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "আপডেট সম্পন্ন" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "নতুন ভার্সন: %s (আকার: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "ভার্সন %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1398,6 +1396,12 @@ msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজা msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "অফিসিয়াল ভাবে সমর্থিত" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1440,8 +1444,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "অফিসিয়াল ভাবে সমর্থিত" +msgid "No longer oficially supported" +msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1512,6 +1516,9 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "The following updates will be skipped:" +#~ msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:" + #~ msgid "About %li seconds remaining" #~ msgstr "%li সেকেন্ড বাকি আছে" diff --git a/po/br.po b/po/br.po index 7a34aba8..29126b80 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" @@ -80,49 +80,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Emborzhiañ an alc'hwezh" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Fazi en ur emborzhiañ ar restr dibabet" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Moarvat n'eo ket ur restr alc'hwezh GPG ar restr dibabet, pe neuze eo " "gwastet." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Fazi en ur zilemel an alc'hwezh" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "N'eus ket tu da zilemel an alc'whezh ho peus dibabet. Kelaouit eo ur bug " "marplij." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -130,38 +130,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Roit un anv evit ar bladenn marplij" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Lakait ur bladenn e-barzh ul lenner marplij:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Pakadoù torr" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -170,34 +170,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -220,15 +220,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -236,11 +236,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -253,11 +253,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -266,42 +266,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -310,15 +310,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -327,21 +327,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -350,49 +350,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -402,19 +402,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -474,11 +474,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -488,28 +488,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -517,74 +517,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -799,125 +799,123 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1351,6 +1349,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1388,7 +1391,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/ca.po b/po/ca.po index 25236054..74ac19db 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" @@ -79,52 +79,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Actualitzacions de programari" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Font" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Font" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importa un clau" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "S'ha produït un error en importar el fitxer seleccionat" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "El fitxer que heu seleccionat no correspon a una clau GPG o pot estar " "corromput." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "S'ha produït un error en esborrar la clau" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La clau que heu seleccionat no es pot esborrar. Notifiqueu-ho com a error de " "programació." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -135,19 +135,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Introduïu un nom per al disc" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Inseriu un disc a la unitat:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Paquets trencats" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -155,21 +155,21 @@ msgstr "" "El vostre sistema conté paquets trencats que no es poden arreglar amb " "aquesta aplicació. Utilitzeu el Synaptic o apt-get abans de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 #, fuzzy msgid "Can't upgrade required meta-packages" msgstr "No s'han pogut actualitzar els metapaquets sol·licitats" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "S'haurà d'esborrar un paquet essencial" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -181,11 +181,11 @@ msgstr "" "de l'error. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -195,12 +195,12 @@ msgstr "" "amb la xarxa. Podeu provar-ho després. A continuació es mostra la llista amb " "els paquets no autenticats." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "No s'ha pogut instal·lar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -209,11 +209,11 @@ msgstr "" "els error. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -242,15 +242,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "S'està llegint la memòria cau" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -258,11 +258,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "No s'ha trobat una rèplica vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -275,11 +275,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -288,11 +288,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "La informació del dipòsit no és vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -300,11 +300,11 @@ msgstr "" "En actualitzar la informació del dipòsit s'ha produït un error. Informeu de " "l'error." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "S'han desactivat les fonts de tercers" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -314,11 +314,11 @@ msgstr "" "reactivar-los, després de l'actualització de programari, des de 'propietats " "del programari' o des del Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "S'ha produït un error en l'actualització" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -326,11 +326,11 @@ msgstr "" "S'ha produït un error mentre s'actualizava el vostre sistema. Comproveu la " "vostra connexió de xarxa i torneu a intentar-ho." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "No disposeu de suficient espai al disc" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +343,15 @@ msgstr "" "apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Voleu iniciar l'actualització?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "No s'han pogut instal·lar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,11 +363,11 @@ msgstr "" "L'actualització s'ha cancel·lat. El vostre sistema ha pogut quedar " "inservible. S'ha executat una recuperació del sistema (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "No s'han pogut descarregar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -375,11 +375,11 @@ msgstr "" "S'ha cancel·lat l'actualització. Comproveu la vostra connexió a Internet o " "el mitjà d'instal·lació i torneu-ho a provar. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Algun programari ja no es mantindrà oficialment" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -392,49 +392,49 @@ msgstr "" "\n" "Si no teniu activat 'universe' se us sugerirà que els desintal·leu. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Voleu esborrar els paquets obsolets?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Omet aquest pas" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "Esbo_rra" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "S'està restaurant l'estat original del sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "S'està comprovant el gestor de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "S'està actualitzant la informació del dipòsit" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "La informació del paquet no és valida" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -444,19 +444,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Actualitzant" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "S'està cercant programari obsolet" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "S'ha completat l'actualització del sistema" @@ -519,11 +519,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "No s'ha trobat l'ordre 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "S'ha produït un error greu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -533,28 +533,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "S'esborrarà %s paquet" msgstr[1] "S'esborraran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "S'instal·larà %s paquet" msgstr[1] "S'instal·laran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "S'actualitzarà %s paquet" msgstr[1] "S'actualitzaran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -562,7 +562,7 @@ msgid "" "You have to download a total of %s. " msgstr "Heu de descarregar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -571,70 +571,70 @@ msgstr "" "L'actualització pot durar algunes hores i no la podreu cancel·lar un cop " "hagi començat." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Per a evitar una possible pèrdua de dades, tanqueu tos els documents i " "aplicacions." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "No s'han pogut trobar actualitzacions" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "El vostre sistema ja està actualitzat" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Esborra %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Instal·la %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Actualitza %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Queden uns %li dies %li hores %li minuts" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Queden unes %li hores %li minuts" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "És necessari que reinicieu el sistema" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -866,112 +866,106 @@ msgstr "Actualitza a la darrera versió d'Ubuntu" msgid "Other updates" msgstr "_Instal·la les actualitzacions" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "No es poden instal·lar les actualitzacions disponibles" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Algunes actualitzacions requereixen la desinstal·lació de programari " -"adicional. Per actualitzar completament el vostre sistema utilitzeu la " -"funció \"Marca totes les actualitzacions\" del gestor de paquets \"Synaptic" -"\" o executeu \"sudo apt-get dist-upgrade\" en un terminal." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Les següents actualitzacions s'ometran:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versió %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Mida de la descàrrega: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "El vostre sistema està actualitzat" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Podeu instal·lar %s actualització" msgstr[1] "Podeu instal·lar %s actualitzacions" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Espereu, això pot tardar una estona." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versió nova: %s (Mida: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versió %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "La vostra distribució ja no es mantindrà més" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -981,17 +975,17 @@ msgstr "" "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més " "informació." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Ja disposeu de la nova distribució '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "L'índex de programari s'ha trencat" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1477,6 +1471,12 @@ msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Paquets mantinguts oficialment (Main)" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1518,8 +1518,8 @@ msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "Paquets mantinguts oficialment (Main)" +msgid "No longer oficially supported" +msgstr "Algun programari ja no es mantindrà oficialment" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1590,6 +1590,19 @@ msgstr "Programari compatible DFSG amb dependències no lliures" msgid "Non-DFSG-compatible Software" msgstr "Programari no compatible DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Algunes actualitzacions requereixen la desinstal·lació de programari " +#~ "adicional. Per actualitzar completament el vostre sistema utilitzeu la " +#~ "funció \"Marca totes les actualitzacions\" del gestor de paquets " +#~ "\"Synaptic\" o executeu \"sudo apt-get dist-upgrade\" en un terminal." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Les següents actualitzacions s'ometran:" + #~ msgid "About %li seconds remaining" #~ msgstr "Queden uns %li segons" diff --git a/po/cs.po b/po/cs.po index e87abdf8..16cb7f59 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála \n" "Language-Team: Czech \n" @@ -81,46 +81,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Aktualizace softwaru" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importovat klíč" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Chyba při importování vybraného souboru" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Vybraný soubor nemusí obsahovat GPG klíč nebo může být porušen." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Chyba při odstraňování klíče" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Vybraný klíč nemohl být odstraněn. Prosím oznamte to jako chybu." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,19 +131,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Prosím zadejte jméno disku" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Prosím vložte disk do mechaniky:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Poškozené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -151,20 +151,20 @@ msgstr "" "Váš systém obsahuje poškozené balíky, které nemohou být tímto programem " "opraveny. Před pokračováním oje prosím pravte použitím synaptic nebo apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Nemohu aktualizovat požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Základní balík by musel být odstraněn" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Nemohu vypočítat aktualizaci" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -176,11 +176,11 @@ msgstr "" "chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Chyba při ověření některých balíků" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -190,12 +190,12 @@ msgstr "" "problémem v síti. Možná to budete chtít zkusit později. Níže je uveden " "seznam neověřených balíků." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Nemohu nainstalovat '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -203,11 +203,11 @@ msgstr "" "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Nemohu odhadnout meta-balík" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -235,15 +235,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Probíhá čtení cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -251,11 +251,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Nenalezeno správné zrcadlo" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -268,11 +268,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Vytvořit standardní zdroje?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -281,11 +281,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Neplatná informace zdroje" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -293,22 +293,22 @@ msgstr "" "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako " "chybu." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Zdroje třetích stran vypnuté" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Chyba během aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -316,11 +316,11 @@ msgstr "" "Nastala chyba během aktualizace. Toto je obvykle způsobeno chybou síťového " "připojení. Prosím zkontrolujte své připojení a zkuste to znovu." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Nedostatek volného místa na disku" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -329,15 +329,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Chcete spustit aktualizaci?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Nelze nainstalovat aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -350,11 +350,11 @@ msgstr "" "stavu. Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo " "Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Nelze stáhnout aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -362,11 +362,11 @@ msgstr "" "Aktualizace byla předčasně ukončena. Prosím zkontrolujte si připojení k " "internetu nebo instalační médium a zkuste to znovu. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -375,23 +375,23 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Odebrat zastaralé balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Přeskočit tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Odebrat" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Chyba při zaznamenávání" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -400,26 +400,26 @@ msgstr "" "prohléhněte níže uvedenou zprávu. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Obnovuje se původní stav systému" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Kontroluje se manažer balíků" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Aktualizují se informace o úložišti" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -429,19 +429,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Požaduje se potvrzení" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Probíhá upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Vyhledáván zastaralý software" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Upgrade systému je dokončen." @@ -504,11 +504,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Příkaz \"diff\" nebyl nalezen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Nastala fatální chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -523,7 +523,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -531,7 +531,7 @@ msgstr[0] "%s balík bude odstraněn." msgstr[1] "%s balíky budou odstraněny." msgstr[2] "%s balíků bude odstraněno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -539,7 +539,7 @@ msgstr[0] "%s nový balík bude nainstalován." msgstr[1] "%s nové balíky budou nainstalovány." msgstr[2] "%s nových balíků bude nainstalováno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -547,7 +547,7 @@ msgstr[0] "%s balík bude nahrazen vyšší verzí." msgstr[1] "%s balíky budou nahrazeny vyšší verzí." msgstr[2] "%s balíky bude nahrazeno vyšší verzí." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -555,75 +555,75 @@ msgid "" "You have to download a total of %s. " msgstr "Bude staženo celkem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Žádné upgrady nebyly nalezeny." -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Váš systém byl již upgradován." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Odstranit %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Nainstalovat %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Upgradovat %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Zhruba %li hodin %li minut zbývá" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Zhruba %li hodin %li minut zbývá" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Vyžadován restartovat" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -858,73 +858,71 @@ msgstr "Upgradovat na poslední verzi Ubuntu" msgid "Other updates" msgstr "Instaluji aktualizace" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Nelze nainstalovat všechny dostupné aktualizace" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Následující aktualizace budou přeskočeny:" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Verze %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Stahuji seznam změn ..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Stahovaná velikost: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Váš systém je aktuální" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -932,35 +930,35 @@ msgstr[0] "Můžete instalovat %s aktualizaci" msgstr[1] "Můžete instalovat %s aktualizace" msgstr[2] "Můžete instalovat %s aktualizací" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Prosím čekejte, může to nějakou dobu trvat." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Aktualizace je dokončena" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nová verze: %s (Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verze %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Vaše distribude už není podporovaná" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -970,17 +968,17 @@ msgstr "" "Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na " "vyšší verzi se podívejte na http://www.ubuntu.com." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1462,6 +1460,11 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Oficiálně podporované" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1503,7 +1506,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +#, fuzzy +msgid "No longer oficially supported" msgstr "Oficiálně podporované" #. CompDescription @@ -1575,6 +1579,9 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Žádný DFSG kompatibilní Software" +#~ msgid "The following updates will be skipped:" +#~ msgstr "Následující aktualizace budou přeskočeny:" + #~ msgid "About %li seconds remaining" #~ msgstr "Zhruba %li sekund zbývá" diff --git a/po/da.po b/po/da.po index 2ced9a0d..1d9e6336 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K \n" "Language-Team: Danish \n" @@ -80,47 +80,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Opdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importér nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Fejl under importering af den valgte fil" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte fil er ikke en GPG-nøglefil eller den er i stykker." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Fejl ved fjernelse af nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Den valgte nøgle kunne ikke fjernes. Rapporter venligst dette som en fejl." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,19 +131,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Indtast venligst et navn til disken" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Indsæt venligst en disk i drevet:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Ødelagte pakker" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -151,22 +151,22 @@ msgstr "" "Dit system indeholder ødelagte pakker som ikke kan repareres med dette " "program. Reparer dem venligst med synaptic eller apt-get før du fortsætter." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke opgradere de krævede meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 #, fuzzy msgid "A essential package would have to be removed" msgstr "Det ville være nødvendigt at fjerne en vigtig pakke" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 #, fuzzy msgid "Could not calculate the upgrade" msgstr "Kunne ikke udregne opgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -178,11 +178,11 @@ msgstr "" "Rapportér venligst dette som en fejl. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Fejl ved godkendelse af nogle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,12 +192,12 @@ msgstr "" "Det anbefales du prøver igen senere. Se længere nede for en liste over " "pakker som ikke kunne godkendes." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -206,12 +206,12 @@ msgstr "" "som en fejl. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 #, fuzzy msgid "Can't guess meta-package" msgstr "Kan ikke gætte meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -240,15 +240,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Læser cache-mellemlager" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -256,11 +256,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -273,11 +273,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -286,11 +286,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Arkivinformation ugyldig." -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -298,22 +298,22 @@ msgstr "" "Opgradering af arkivet resulterede i en ødelagt fil. raporter venligst dette " "som en fejl." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Trediepartskilder er fravalgt" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Fejl under opdatering" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -321,11 +321,11 @@ msgstr "" "En fejl forekom under opdateringen. Dette skyldes som regel et " "netværksproblem, tjek venligst din netværksforbindelse og prøv igen." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Der er ikke nok fri diskplads" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -337,15 +337,15 @@ msgstr "" "køre 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Vil du starte opgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Kunne ikke installere opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -357,11 +357,11 @@ msgstr "" "Upgraderingen afbrydes nu. Dit system kan forekomme ustabilt. En oprydning " "blev foretaget (dpkg --configura -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Kunne ikke hente opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -369,11 +369,11 @@ msgstr "" "Opgraderingen afbryder nu. Tjek venligst din internetforbindelse eller dit " "installationsmedie og prøv igen. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Noget software er ikke længere officielt understøttet" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -387,25 +387,25 @@ msgstr "" "Hvis du ikke har slået 'universe' til, vil fjernelsen af disse pakker blive " "foreslået i det næste trin. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Fjern forældede pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 #, fuzzy msgid "_Skip This Step" msgstr "_Spring dette trin over" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 #, fuzzy msgid "Error during commit" msgstr "Fejl under udførsel" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -414,26 +414,26 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Genstarter oprindelig systemtilstand" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Undersøger pakkehåndtering" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Opdaterer arkivinformation" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -443,19 +443,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Opgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Søger efter forældet software" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Systemopgradering er fuldført" @@ -518,11 +518,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Kommandoen 'diff' blev ikke fundet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "En alvorlig fejl opstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -537,28 +537,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pakke vil blive fjernet." msgstr[1] "%s pakker vil blive fjernet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s ny pakke vil blive installeret." msgstr[1] "%s nye pakker vil blive installeret." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pakke vil blive opgraderet." msgstr[1] "%s pakker vil bliver opgraderet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -566,75 +566,75 @@ msgid "" "You have to download a total of %s. " msgstr "Der skal i alt hentes %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Opgraderingen kan tage flere timer og kan ikke fortrydes senere." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Kunne ikke finde nogen tilgængelige opgraderinger" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Dit system er allerede opgraderet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Fjern %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Opgrader %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Tid tilbage(ca.): %li dage %li timer %li minutter" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Tid tilbage(ca.): %li timer %li minutter" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Genstart af maskinen er påkrævet" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -875,111 +875,106 @@ msgstr "Opgrader til seneste version af Ubuntu" msgid "Other updates" msgstr "_Installer Opdateringer" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Kan ikke installere alle tilgængelige opdateringer" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Nogle opdateringer kræver yderligere software. Brug funktionen \"Vælg alle " -"opgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo " -"apt-get dist-upgrade\" i en terminal for at opdatere dit system fuldstændigt." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Følgende opdateringer vil blive sprunget over:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Henter listen med ændringer..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Overføringsstørelse: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Dit system er opdateret" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installere %s opdatering" msgstr[1] "Du kan installere %s opdateringer" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Vent venligst, dette kan tage et stykke tid." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Opdatering udført" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Din distribution understøtes ikke længere" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -989,17 +984,17 @@ msgstr "" "opdateringer. Opgrader til en senere version af Ubuntu Linux. Se http://www." "ubuntu.com (engalsk) for mere informaiton om opgradering." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Software indexet er i stykker" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1495,6 +1490,12 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Officielt understøttet" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1537,8 +1538,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "Officielt understøttet" +msgid "No longer oficially supported" +msgstr "Noget software er ikke længere officielt understøttet" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1610,6 +1611,19 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Nogle opdateringer kræver yderligere software. Brug funktionen \"Vælg " +#~ "alle opgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller kør " +#~ "\"sudo apt-get dist-upgrade\" i en terminal for at opdatere dit system " +#~ "fuldstændigt." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Følgende opdateringer vil blive sprunget over:" + #~ msgid "About %li seconds remaining" #~ msgstr "Tid tilbage(ca.): %li sekunder" diff --git a/po/de.po b/po/de.po index 6728403b..bb01bd71 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" @@ -81,52 +81,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Software-Aktualisierungen" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Quellen" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Quellen" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Schlüssel importieren" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Die ausgewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder " "beschädigt." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Der ausgewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -137,19 +137,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Geben Sie einen Namen für das Medium ein" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie ein Medium in das Laufwerk:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Defekte Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -158,20 +158,20 @@ msgstr "" "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor " "Sie fortfahren." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Ein grundlegendes Paket müsste entfernt werden" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Die Aktualisierung konnte nicht berechnet werden" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -183,11 +183,11 @@ msgstr "" "erstellen Sie hierfür einen Fehlerbericht. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -198,12 +198,12 @@ msgstr "" "später noch einmal. Die unten stehenden Pakete konnten nicht auf ihre " "Echtheit hin bestätigt werden:" -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "›%s‹ kann nicht installiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,11 +212,11 @@ msgstr "" "Sie hierfür einen Fehlerbericht. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Metapaket konnte nicht bestimmt werden" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -245,15 +245,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Zwischenspeicher wird ausgelesen" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -261,11 +261,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Kein gültiger Mirror gefunden" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +285,11 @@ msgstr "" "Wenn Sie 'Nein' wählen, wird das Update abgebrochen." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Standardquellen generieren?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +303,11 @@ msgstr "" "Sollen Standardeinträge für '%s' hinzugefügt werden? Wenn Sie 'Nein' " "auswählen, wird das Update abgebrochen." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Ungültige Kanalinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,11 +315,11 @@ msgstr "" "Die Aktualisierung der Quellen-Information ergab eine ungültige Datei. Bitte " "erstellen Sie einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Quellen von Drittanbietern deaktiviert" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -329,11 +329,11 @@ msgstr "" "Sie können diese nach dem Upgrade mit dem 'software-properties'-Werkzeug " "oder mit Synaptic reaktivieren." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Fehler während der Aktualisierung" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -342,11 +342,11 @@ msgstr "" "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre " "Netzwerkverbindung und versuchen Sie es noch einmal." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Unzureichender freier Festplattenspeicher" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -358,15 +358,15 @@ msgstr "" "temporäre Pakete von frühreren Installation mit 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Möchten Sie die Aktualisierung starten?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Die Aktualisierungen konnten nicht installiert werden" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,11 +379,11 @@ msgstr "" "unbenutzbaren Zustand befinden. Eine Wiederherstellung wurde durchgeführt " "(dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -392,11 +392,11 @@ msgstr "" "Internet-Verbindung oder Ihr Installationsmedium und versuchen Sie es noch " "einmal. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -410,23 +410,23 @@ msgstr "" "Wenn sie 'universe' nicht aktiviert haben, werden diese Pakete im nächsten " "Schritt zum Entfernen vorgeschlagen. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Veraltete Pakete entfernen?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "Ü_berspringen" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Entfernen" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Fehler beim Anwenden" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,26 +435,26 @@ msgstr "" "Nachricht für nähere Informationen. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Wiederherstellen des alten Systemzustandes" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Paketverwaltung wird überprüft" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Aktualisiere Quellen-Information" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Ungültige Paketinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -468,19 +468,19 @@ msgstr "" "Dies deutet auf einen gravierenden Fehler hin, bitte erstellen Sie hierfür " "einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Nach Bestätigung fragen" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Aktualisiere" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Nach veralteter Software wird gesucht" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Aktualisierung ist abgeschlossen." @@ -543,11 +543,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Das 'diff'-Kommando konnte nicht gefunden werden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Ein fataler Fehler ist aufgetreten" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -563,28 +563,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s Paket wird entfernt." msgstr[1] "%s Pakete werden entfernt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s neues Paket wird installiert." msgstr[1] "%s neue Pakete werden installiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s Paket wird aktualisiert." msgstr[1] "%s Pakete werden aktualisiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -592,7 +592,7 @@ msgid "" "You have to download a total of %s. " msgstr "Insgesamt müssen %s heruntergeladen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -601,70 +601,70 @@ msgstr "" "Die Aktualisierung kann mehrere Stunden dauern und zu keiner Zeit mehr " "abgebrochen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Um Datenverlust zu vermeiden, schließen Sie alle offenen Anwendungen und " "Dokumente." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Es liegen keine Aktualisierungen vor" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Ihr System wurde bereits aktualisiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "%s wird entfernt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "%s wird installiert" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "%s wird aktualisiert" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Ungefähr %li Tag(e) %li Stunde(n) %li Minute(n) verbleibend" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Ungefähr %li Stunde(n) %li Minute(n) verbleibend" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Neustart erforderlich" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -912,112 +912,106 @@ msgstr "Aus die neueste Version von Ubuntu aktualisieren" msgid "Other updates" msgstr "Aktualisierungen werden installiert" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Einige Aktualisierungen erfordern das Entfernen von anderen Anwendungen. " -"Verwenden Sie die Funktion »Aktualisierungen vormerken« in der Synaptic " -"Paketverwaltung oder führen Sie den Befehl »sudo apt-get dist-upgrade« in " -"einem Terminal aus, um Ihr System vollständig zu aktualisieren." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Die folgenden Aktualisierungen werden ausgelassen:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Liste mit Änderungen wird heruntergeladen..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Download-Größe: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Ihr System ist auf dem aktuellen Stand" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Sie können %s Aktualisierung installieren" msgstr[1] "Sie können %s Aktualisierungen installieren" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Aktualisierung ist abgeschlossen" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Neue Version: %s (Größe: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Ihre Distribution wird nicht länger unterstützt" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1028,17 +1022,17 @@ msgstr "" "System auf eine neuere Version von Ubuntu Linux. Auf http://www.ubuntuusers." "de oder http://www.ubuntu.com finden Sie weitere Informationen hierzu." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Neue Version '%s' der Distribution ist freigegeben" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Der Software-Index ist beschädigt" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1532,6 +1526,11 @@ msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Offiziell unterstützt" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1573,8 +1572,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Offiziell unterstützt" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1644,6 +1644,19 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Einige Aktualisierungen erfordern das Entfernen von anderen Anwendungen. " +#~ "Verwenden Sie die Funktion »Aktualisierungen vormerken« in der Synaptic " +#~ "Paketverwaltung oder führen Sie den Befehl »sudo apt-get dist-upgrade« in " +#~ "einem Terminal aus, um Ihr System vollständig zu aktualisieren." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Die folgenden Aktualisierungen werden ausgelassen:" + #~ msgid "About %li seconds remaining" #~ msgstr "Ungefähr %li Sekunden verbleibend" diff --git a/po/el.po b/po/el.po index c913c3da..69ee6eb5 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -79,49 +79,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "Κανάλι λογισμικού" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "Ενεργό" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Εισαγωγή κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να " "είναι κατεστραμμένο." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Σφάλμα απομάκρυνσης του κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως " "σφάλμα." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -132,19 +132,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Κατεστραμμένα πακέτα" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -153,20 +153,20 @@ msgstr "" "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή apt-" "get για να συνεχίσετε." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -178,11 +178,11 @@ msgstr "" "Παρακαλώ αναφέρετε το ως σφάλμα. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,12 +192,12 @@ msgstr "" "σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα των " "μη πιστοποιημένων πακέτων." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -206,11 +206,11 @@ msgstr "" "ως σφάλμα. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -239,15 +239,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Ανάγνωση λανθάνουσας μνήμης" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -255,11 +255,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -280,11 +280,11 @@ msgstr "" " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Δημιουργία προεπιλεγμένων πηγών;" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -298,11 +298,11 @@ msgstr "" "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε " "'Όχι' η ενημέρωση θα ακυρωθεί." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Μη έγκυρες πληροφορίες repository" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -310,11 +310,11 @@ msgstr "" "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο " "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Απενεργοποιήθηκαν πηγές τρίτων" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -324,11 +324,11 @@ msgstr "" "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-" "properties' ή με το synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Σφάλμα κατά την ενημέρωση" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -336,11 +336,11 @@ msgstr "" "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει " "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -352,15 +352,15 @@ msgstr "" "προηγούμενων εγκαταστάσεων με την εντολή 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -372,11 +372,11 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. " "Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Αδυναμία λήψης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -384,11 +384,11 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -402,23 +402,23 @@ msgstr "" "Αν δεν έχετε ενεργοποιημένο το 'universe' , θα γίνει πρόταση για απομάκρυνση " "αυτών των πακέτων στο επόμενο βήμα. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Αφαίρεση παρωχημένων πακέτων;" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "Παράκα_μψη αυτου του βήματος" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Απομάκρυνση" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Σφάλμα κατά την υποβολή" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -427,26 +427,26 @@ msgstr "" "παρακάτω μήνυμα για περισσότερες πληροφορίες. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Έλεγχος διαχειριστή πακέτων" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Ενημέρωση πληροφοριών repository" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Μη έγκυρες πληροφορίες πακέτου" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -459,19 +459,19 @@ msgstr "" "απαραίτητο πακέτο '%s'.\n" " Αυτό σημαίνει ότι πρόκειται για σημαντικό σφάλμα, παρακαλώ αναφέρετε το." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Ερώτηση για επιβεβαίωση" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Γίνεται αναβάθμιση" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε." @@ -534,11 +534,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Η εντολή 'diff' δεν βρέθηκε" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Προέκυψε μοιραίο σφάλμα" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -554,28 +554,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί." msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s νέο πακέτο πρόκειται να εγκατασταθεί." msgstr[1] "%s νέο πακέτα πρόκειται να εγκατασταθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί." msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -583,7 +583,7 @@ msgid "" "You have to download a total of %s. " msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -592,70 +592,70 @@ msgstr "" "Η αναβάθμιση μπορεί να διαρκέσει αρκετές ώρες και δεν είναι δυνατή η ακύρωση " "της αργότερα." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και " "έγγραφα." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Δεν βρέθηκαν αναβαθμίσεις" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Απομάκρυνση %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Εγκατάσταση %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Αναβάθμιση %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Απομένουν περίπου %li ημέρες %li ώρες και %li λεπτά" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Απομένουν περίπου %li ώρες και %li λεπτά" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Απαιτείται επανεκκίνηση" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -896,112 +896,106 @@ msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubunt msgid "Other updates" msgstr "Εγκατάσταση ενημερώσεων" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Μερικές ενημερώσεις απαιτούν την απομάκρυνση επιπρόσθετου λογισμικού. " -"Χρησιμοποιήστε την λειτουργία \"Σημείωση όλων των αναβαθμίσεων\" από το " -"διαχειριστή πακέτων ή την εντολή \"sudo apt-get dist-upgrade\" σε ένα " -"τερματικό για να αναβαθμίσετε πλήρως το σύστημα σας." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Οι παρακάτω ενημερώσεις θα παρακαμφθούν:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Έκδοση%s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Λήψη της λίστας των αλλαγών..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Μέγεθος λήψης: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Το σύστημα σας είναι ενημερωμένο" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση" msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Η ενημέρωση ολοκληρώθηκε" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Νέα έκδοση: %s (Μέγεθος: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Έκδοση%s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Η διανομή σας δεν υποστηρίζεται πια" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1012,17 +1006,17 @@ msgstr "" "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες " "για την αναβάθμιση." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Είναι διαθέσιμη νέα έκδοση διανομής '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1510,6 +1504,11 @@ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Oficially supported" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1550,8 +1549,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Oficially supported" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1622,6 +1622,19 @@ msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Μερικές ενημερώσεις απαιτούν την απομάκρυνση επιπρόσθετου λογισμικού. " +#~ "Χρησιμοποιήστε την λειτουργία \"Σημείωση όλων των αναβαθμίσεων\" από το " +#~ "διαχειριστή πακέτων ή την εντολή \"sudo apt-get dist-upgrade\" σε ένα " +#~ "τερματικό για να αναβαθμίσετε πλήρως το σύστημα σας." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Οι παρακάτω ενημερώσεις θα παρακαμφθούν:" + #~ msgid "About %li seconds remaining" #~ msgstr "Απομένουν περίπου %li δευτερόλεπτα" diff --git a/po/en_AU.po b/po/en_AU.po index d27d9d13..2bcde566 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons \n" "Language-Team: English (Australia) \n" @@ -80,47 +80,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Import key" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,19 +131,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Please enter a name for the disc" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Please insert a disc in the drive:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Broken packages" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -151,20 +151,20 @@ msgstr "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Can't upgrade required meta-packages" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "An essential package would have to be removed" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -176,11 +176,11 @@ msgstr "" "this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -190,12 +190,12 @@ msgstr "" "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -204,11 +204,11 @@ msgstr "" "bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Can't guess meta-packag" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -237,15 +237,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Reading cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -253,11 +253,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -277,11 +277,11 @@ msgstr "" "If you select 'no' the update will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -294,11 +294,11 @@ msgstr "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -306,11 +306,11 @@ msgstr "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -320,11 +320,11 @@ msgstr "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Error during update" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -332,11 +332,11 @@ msgstr "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Not enough free disk space" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -348,15 +348,15 @@ msgstr "" "'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Could not install the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -368,11 +368,11 @@ msgstr "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Could not download the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -380,11 +380,11 @@ msgstr "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Some software no longer officially supported" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -398,23 +398,23 @@ msgstr "" "If you don't have 'universe' enabled these packages will be suggested for " "removal in the next step. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Remove obsolete packages?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Skip This Step" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Remove" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Error during commit" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -423,26 +423,26 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Restoring original system state" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Checking package manager" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Updating repository information" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -455,19 +455,19 @@ msgstr "" "not be found anymore.\n" "This indicates a serious error, please report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Asking for confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Upgrading" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Searching for obsolete software" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "System upgrade is complete." @@ -531,11 +531,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "The 'diff' command was not found" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "A fatal error occured" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -550,28 +550,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s package is going to be removed." msgstr[1] "%s packages are going to be removed." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s new package is going to be installed." msgstr[1] "%s new packages are going to be installed." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s package is going to be upgraded." msgstr[1] "%s packages are going to be upgraded." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -579,7 +579,7 @@ msgid "" "You have to download a total of %s. " msgstr "You have to download a total of %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -587,68 +587,68 @@ msgid "" msgstr "" "The upgrade can take several hours and cannot be canceled at any time later." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Could not find any upgrades" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Your system has already been upgraded." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Remove %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Install %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "About %li days %li hours %li minutes remaining" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "About %li hours %li minutes remaining" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Reboot required" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -885,111 +885,106 @@ msgstr "Upgrade to the latest version of Ubuntu" msgid "Other updates" msgstr "_Install Updates" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Cannot install all available updates" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "The following updates will be skipped:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Downloading the list of changes..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Download size: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Your system is up-to-date" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "You can install %s update" msgstr[1] "You can install %s updates" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "New version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Your distribution is not supported anymore" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -999,17 +994,17 @@ msgstr "" "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "New distribution release '%s' is available" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1499,6 +1494,12 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Officially supported" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1541,8 +1542,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "Officially supported" +msgid "No longer oficially supported" +msgstr "Some software no longer officially supported" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1613,6 +1614,18 @@ msgstr "DFSG-compatible Software with Non-Free Dependencies" msgid "Non-DFSG-compatible Software" msgstr "Non-DFSG-compatible Software" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "The following updates will be skipped:" + #~ msgid "About %li seconds remaining" #~ msgstr "About %li seconds remaining" diff --git a/po/en_CA.po b/po/en_CA.po index d11908c9..f71ff780 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -81,49 +81,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,38 +131,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -173,23 +173,23 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -198,11 +198,11 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -241,11 +241,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -258,11 +258,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,43 +271,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -316,15 +316,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -333,21 +333,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -356,50 +356,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -409,20 +409,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -483,11 +483,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -497,28 +497,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -526,75 +526,75 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -822,129 +822,126 @@ msgstr "" msgid "Other updates" msgstr "_Install" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:277 -#, fuzzy -msgid "The following updates will be skipped:" -msgstr "The following packages are not upgraded:" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Cancel downloading the ChangeLog" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installing updates..." msgstr[1] "Installing updates..." -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1418,6 +1415,12 @@ msgstr "Ubuntu 5.04 Security Updates" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Officially supported" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1460,7 +1463,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Officially supported" #. CompDescription @@ -1532,6 +1535,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "The following updates will be skipped:" +#~ msgstr "The following packages are not upgraded:" + #, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index f501a497..370e696e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" @@ -80,49 +80,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -130,38 +130,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -172,23 +172,23 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -197,11 +197,11 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -240,11 +240,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -257,11 +257,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,43 +270,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -315,15 +315,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,21 +332,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -355,50 +355,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -408,21 +408,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 #, fuzzy msgid "Asking for confirmation" msgstr "Checking system configuration" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -483,11 +483,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -497,28 +497,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -526,75 +526,75 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -821,129 +821,126 @@ msgstr "" msgid "Other updates" msgstr "Installing updates..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:277 -#, fuzzy -msgid "The following updates will be skipped:" -msgstr "The following packages are not upgraded:" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Downloading Changes" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installing updates..." msgstr[1] "Installing updates..." -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1417,6 +1414,12 @@ msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Officially supported" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1460,7 +1463,7 @@ msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Officially supported" #. CompDescription @@ -1533,6 +1536,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "The following updates will be skipped:" +#~ msgstr "The following packages are not upgraded:" + #, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" diff --git a/po/es.po b/po/es.po index f3c3ed85..5af5554c 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López \n" "Language-Team: Spanish \n" @@ -82,52 +82,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Actualizaciones de software" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Fuente" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Fuente" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importar clave" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Hubo un error al importar el archivo seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Puede que el archivo seleccionado no sea un archivo de clave GPG o que esté " "corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto " "como un fallo." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -138,19 +138,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Por favor, introduzca un nombre para el disco" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Por favor, inserte un disco en la unidad:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Paquetes rotos" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -159,20 +159,20 @@ msgstr "" "software. Por favor, arréglelos primero usando Synaptic o apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "No se han podido actualizar los meta-paquetes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Se ha tenido que desinstalar un paquete esencial" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -184,11 +184,11 @@ msgstr "" "actualización. Por favor, informe de ésto como un fallo. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Error autenticando algunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -198,12 +198,12 @@ msgstr "" "problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una " "lista de los paquetes no autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,11 +212,11 @@ msgstr "" "como un fallo. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "No se ha podido determinar el meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -245,15 +245,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Leyendo caché" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -261,11 +261,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "No se ha encontrado un servidor espejo válido" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +286,11 @@ msgstr "" "Si selecciona «No» se cancelará la actualización." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "¿Generar orígenes predeterminados?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -304,11 +304,11 @@ msgstr "" "¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se " "cancelará la actualización." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Información de repositorio no válida" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -316,11 +316,11 @@ msgstr "" "La actualización de la información del repositorio generó un archivo " "incorrecto. Por favor, informe de ésto como un error." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Orígenes de terceros desactivados" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -330,11 +330,11 @@ msgstr "" "volver a activarlas tras la actualización con la herramienta «Propiedades " "del software», o con Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Error durante la actualización" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -343,11 +343,11 @@ msgstr "" "tipo de problema en la red, por lo que le recomendamos que compruebe su " "conexión de red y vuelva a intentarlo." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "No hay espacio suficiente en el disco" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +359,15 @@ msgstr "" "de instalaciones anteriores tecleando «sudo apt-get clean» en una terminal." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "¿Desea comenzar la actualización?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "No se han podido instalar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -380,11 +380,11 @@ msgstr "" "estado inutilizable. Se está llevando a cabo una recuperación (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "No se han podido descargar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -392,11 +392,11 @@ msgstr "" "La actualización se interrumpirá ahora. Por favor, compruebe su conexión a " "Internet (o su soporte de instalación) y vuelva a intentarlo. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Algunos programas ya no están soportados oficialmente" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -410,23 +410,23 @@ msgstr "" "Si no tiene activado el «universe», se le sugerirá que desinstale estos " "paquetes en el siguiente paso. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "¿Desinstalar los paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Saltar este paso" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Quitar" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Error durante la confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,26 +435,26 @@ msgstr "" "inferior para más información. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Restaurando el estado original del sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Comprobando gestor de paquetes" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Actualizando la información del repositorio" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Información de paquete no válida" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +467,19 @@ msgstr "" "posible encontrar el paquete esencial «%s».\n" "Esto indica un problema serio; por favor, informe de esto como un fallo." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Solicitando confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Actualizando" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Buscando paquetes obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "La actualización del sistema se ha completado." @@ -542,11 +542,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "No se ha encontrado el comando «diff»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Ha ocurrido un error fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -562,28 +562,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Se va a desinstalar %s paquete." msgstr[1] "Se van a desinstalar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Se va a instalar %s paquete nuevo." msgstr[1] "Se van a instalar %s paquetes nuevos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "Se va a actualizar %s paquete." msgstr[1] "Se van a actualizar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -591,7 +591,7 @@ msgid "" "You have to download a total of %s. " msgstr "Debe descargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -600,70 +600,70 @@ msgstr "" "La actualización puede durar varias horas, y no podrá ser cancelada después " "en ningún momento." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 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." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "No se ha podido encontrar ninguna actualización" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Su sistema ya ha sido actualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Desinstalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Faltan %li dias %li horas %li minutos" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Faltan %li horas %li minutos" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Se requiere reiniciar el equipo" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -909,112 +909,106 @@ msgstr "Actualizar a la última versión de Ubuntu" msgid "Other updates" msgstr "Instalando actualizaciones" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "No se han podido instalar todas las actualizaciones disponibles" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Algunas actualizaciones requieren la desinstalación de software. Utilice la " -"función «Marcar todas las actualizaciones» del gestor de paquetes " -"«Synaptic», o ejecute «sudo apt-get dist-upgrade» en una terminal, para " -"actualizar completamente su sistema." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Se pasarán por alto las siguientes actualizaciones:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Descargando la lista de cambios..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Tamaño de descarga: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Su sistema está actualizado" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Puede instalar %s actualización" msgstr[1] "Puede instalar %s actualizaciones" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Por favor, espere; esto puede tardar un poco." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "La actualización se ha completado" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nueva versión: %s (Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Su distribución ya no está soportada" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1024,17 +1018,17 @@ msgstr "" "críticas. Actualícese a una versión posterior de Ubuntu Linux. Visite http://" "www.ubuntu.com para más información sobre la actualización." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Está disponible la nueva versión «%s» de la distribución" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "El índice de software está dañado" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1526,6 +1520,11 @@ msgstr "Actualizaciones de seguridad de Ubuntu 5.04" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Soportado oficialmente" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1567,8 +1566,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Soportado oficialmente" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Algunos programas ya no están soportados oficialmente" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1638,6 +1638,19 @@ msgstr "Software compatible con la DFSG con dependencias no libres" msgid "Non-DFSG-compatible Software" msgstr "Software no compatible con la DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Algunas actualizaciones requieren la desinstalación de software. Utilice " +#~ "la función «Marcar todas las actualizaciones» del gestor de paquetes " +#~ "«Synaptic», o ejecute «sudo apt-get dist-upgrade» en una terminal, para " +#~ "actualizar completamente su sistema." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Se pasarán por alto las siguientes actualizaciones:" + #~ msgid "About %li seconds remaining" #~ msgstr "Faltan %li segundos" diff --git a/po/fi.po b/po/fi.po index f6cbc552..2c1b01ac 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -79,50 +79,50 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "Ohjelmistokanava" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "Aktiivinen" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Lähdekoodi" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Lähdekoodi" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Tuo avain" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Valittu tiedosto ei ole kelvollinen GPG-avaintiedosto, tai se on " "vahingoittunut." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -133,19 +133,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Syötä nimi levylle" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Aseta levy asemaan:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Rikkinäisiä paketteja" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -154,20 +154,20 @@ msgstr "" "ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen " "jatkamista." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Ei voida päivittää tarvittavia metapaketteja" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Välttämätön paketti jouduttaisiin poistamaan" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -179,11 +179,11 @@ msgstr "" "korjata. Ilmoita tästä virheraportilla. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Joitain paketteja todennettaessa tapahtui virhe" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,12 +193,12 @@ msgstr "" "Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista " "paketeista." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Ei voitu asentaa pakettia \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -206,11 +206,11 @@ msgstr "" "Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Ei voitu arvata metapakettia" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -239,15 +239,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Luetaan kätköä" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -255,11 +255,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Ei löytynyt sopivaa palvelinta" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -280,11 +280,11 @@ msgstr "" "Jos valitset \"Ei\", päivitys keskeytyy." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Luo ja ota käyttöön oletusohjelmalähteet?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -297,11 +297,11 @@ msgstr "" "Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys " "keskeytyy." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Virhe ohjelmavarastotiedoissa" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -309,11 +309,11 @@ msgstr "" "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita " "tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -323,11 +323,11 @@ msgstr "" "käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen \"ohjelma-" "asetukset\"-työkalulla tai Synaptic-ohjelmalla." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Virhe päivitettäessä" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -335,11 +335,11 @@ msgstr "" "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. " "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Levytilaa ei ole riittävästi" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -351,15 +351,15 @@ msgstr "" "komentoa 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Haluatko aloittaaa päivityksen?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Ei voitu asentaa päivityksiä" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -371,11 +371,11 @@ msgstr "" "Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. " "Korjaustoimenpiteet suoritettiin (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Päivityksiä ei voitu noutaa" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -383,11 +383,11 @@ msgstr "" "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. " "CD) toiminta ja yritä uudelleen. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -401,23 +401,23 @@ msgstr "" "Jos sinulla ei ole 'universe'-ohjelmakanavaa otettuna käyttöön, nämä paketit " "suositellaan poistettaviksi seuraavassa kohdassa. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Poista vanhentuneet paketit?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Ohita tämä kohta" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Poista" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Virhe suoritettaesa" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -426,26 +426,26 @@ msgstr "" "lisätietoja. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Palautetaan alkuperäistä järjestelmän tilaa" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Tarkistetaan pakettienhallintaa" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Päivitetään ohjelmavarastotietoja" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Pakettitiedot viallisia" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -458,19 +458,19 @@ msgstr "" "enää löydetty.\n" "Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Pyydetään vahvistusta" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Päivitetään" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Etsitään vanhetuneita ohjelmia" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Järjestelmän päivitys on valmis." @@ -533,11 +533,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Komentoa 'diff' ei löytynyt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Vakava virhe tapahtui" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -550,28 +550,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paketti poistetaan" msgstr[1] "%s pakettia poistetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s uusi paketti asennetaan" msgstr[1] "%s uutta pakettia asennetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paketti päivitetään" msgstr[1] "%s pakettia päivitetään" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -579,7 +579,7 @@ msgid "" "You have to download a total of %s. " msgstr "Noudettavaa yhteensä %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -587,69 +587,69 @@ msgid "" msgstr "" "Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Päivityksiä ei löytynyt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Järjestelmäsi on jo päivitetty." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Poista %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Asenna %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Päivitä %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Noin %li päivää, %li tuntia, %li minuuttia jäljellä" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Noin %li tuntia, %li minuuttia jäljellä" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Uudellenkäynnistys vaaditaan" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -889,112 +889,107 @@ msgstr "Päivitä Ubuntun viimeisimpään versioon" msgid "Other updates" msgstr "Asennetaan päivityksiä" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Jotkut päivitykset vaativat muiden ohjelmien poistoa. Käytä \"Merkitse " -"kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai " -"suorita päätteessä komento \"sudo apt-get dist-upgrade\"." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Seuraavat päivitykset ohitetaan:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versio: %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Noudetaan muutosluetteloa..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 #, fuzzy msgid "None" msgstr "Ei-vapaa" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "%s täytyy noutaa" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Järjestelmäsi on ajan tasalla" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Voit asentaa %s päivityksen" msgstr[1] "Voit asentaa %s päivitystä" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Odota, tämä voi kestää jonkun aikaa." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Päivitys on valmis" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Uusi versio: %s (koko: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versio: %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Jakeluasi ei enää tueta" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1004,17 +999,17 @@ msgstr "" "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja " "päivittämisestä osoitteesta http://www.ubuntu.com/" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Uusi jakelujulkaisu \"%s\" on saatavilla" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Ohjelmaluettelo on rikkinäinen" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1502,6 +1497,11 @@ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Virallisesti tuettu" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1543,8 +1543,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Virallisesti tuettu" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1615,6 +1616,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmat" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Jotkut päivitykset vaativat muiden ohjelmien poistoa. Käytä \"Merkitse " +#~ "kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai " +#~ "suorita päätteessä komento \"sudo apt-get dist-upgrade\"." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Seuraavat päivitykset ohitetaan:" + #~ msgid "About %li seconds remaining" #~ msgstr "Noin %li sekuntia jäljellä" diff --git a/po/fr.po b/po/fr.po index d8a8e79f..18e5ac8a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" @@ -80,52 +80,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Mises à jour des logiciels" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importer la clé" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Erreur lors de l'importation du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Le fichier sélectionné n'est peut-être pas une clé GPG ou alors il est " "corrompu." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La clé que vous avez sélectionnée ne peut être supprimée. Veuillez rapporter " "ce bogue." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -136,19 +136,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Veuillez saisir un nom pour le disque" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Veuillez insérer un disque dans le lecteur :" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Paquets défectueux" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -157,20 +157,20 @@ msgstr "" "ce logiciel. Veuillez d'abord les réparer à l'aide de Synaptic ou d'apt-get " "avant de continuer." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Les meta-paquets désirés n'ont pu être mis à jour" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Un paquet essentiel devrait être enlevé" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Impossible de calculer la mise à jour" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -182,11 +182,11 @@ msgstr "" "rapporter ce bogue. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,12 +196,12 @@ msgstr "" "problème temporaire du réseau. Vous voudrez sans doute réessayer plus tard. " "Vous trouverez ci-dessous une liste des paquets non authentifiés." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installer « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -210,11 +210,11 @@ msgstr "" "rapporter ce bogue. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -243,15 +243,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Lecture du cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -259,11 +259,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Aucun mirroir valide n'a pu être trouvé" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -284,11 +284,11 @@ msgstr "" "Sinon, la mise à jour sera annulée." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Générer les sources par défaut ?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -302,11 +302,11 @@ msgstr "" "Les entrées par défaut pour « %s » doivent-elles être ajoutées ? Si vous " "sélectionnez « Non », la mise à jour sera annulée." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Informations sur le dépôt invalides" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -314,11 +314,11 @@ msgstr "" "La mise à jour des informations du dépôt a créé un fichier invalide. Merci " "de rapporter ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Sources provenant de tiers désactivées" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -328,11 +328,11 @@ msgstr "" "désactivées. Vous pouvez les réactiver après la mise à jour avec l'outil « " "Gestionnaire de canaux logiciels » ou avec Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Erreur lors de la mise à jour" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -341,11 +341,11 @@ msgstr "" "un problème de réseau. Veuillez vérifier votre connexion au réseau et " "réessayer." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Il n'y a pas assez d'espace libre sur le disque" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -358,15 +358,15 @@ msgstr "" "get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Voulez-vous commencer la mise à jour ?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Les mises à jour n'ont pu être installées" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -378,11 +378,11 @@ msgstr "" "Abandon de la mise à jour. Votre système est peut-être inutilisable. Une " "recupération a été lancée (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Les mises à jour n'ont pu être téléchargées" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -390,11 +390,11 @@ msgstr "" "Abandon de la mise à jour. Veuillez vérifier votre connexion Internet ou " "votre médium d'installation puis réessayez. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Certains logiciels ne sont plus supportés officiellement" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -408,23 +408,23 @@ msgstr "" "Si vous n'avez pas activé le dépot 'universe', la suppression de ces paquets " "vous sera suggérée lors de la prochaine étape. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Enlever les paquets obsolètes ?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Passer cette étape" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Supprimer" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Erreur pendant la soumission" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -433,26 +433,26 @@ msgstr "" "ci-dessous pour plus d'informations. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Restaurer le système dans son état d'origine" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Vérification du gestionnaire de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Mise à jour des informations sur les dépôts en cours" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Information sur les paquet invalides" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -466,19 +466,19 @@ msgstr "" "Ceci est indique qu'une erreur important s'est produite, veuillez rapporter " "ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Demande de confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Mise à jour en cours" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Recherche de logiciels obsolètes" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "La mise à jour du système est terminée." @@ -541,11 +541,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "La commande « diff » n'a pu être trouvée" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Une erreur fatale est survenue" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -561,28 +561,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Le paquet %s va être supprimé." msgstr[1] "Les paquets %s vont être supprimés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Le paquet %s va être installé." msgstr[1] "Les paquets %s vont être installés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "Le paquet %s va être mis à jour." msgstr[1] "Les paquets %s vont être mis à jour." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -590,7 +590,7 @@ msgid "" "You have to download a total of %s. " msgstr "Vous devez télécharger un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -599,70 +599,70 @@ msgstr "" "La mise à jour peut prendre plusieurs heures et ne peut être annulée " "ultérieurement." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pour éviter toute perte de données accidentelle, veuillez fermer toutes les " "applications et documents ouverts." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Aucune mise à jour n'est disponible" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Votre système a déjà été mis à jour." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Supprimer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Mettre à jour %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Environ %li jours %li heures %li minutes restantes" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Environ %li heures %li minutes restantes" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Redémarrage de l'ordinateur requis" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -908,112 +908,106 @@ msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" msgid "Other updates" msgstr "Installation des mises à jour" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Impossible d'installer toutes les mises à jour disponibles" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Certaines mises à jour requièrent la suppression de logiciels " -"supplémentaires. Utilisez la fonction « Sélectionner la totalité des mises à " -"jour » du « Gestionnaire de paquets Synaptic » ou lancez « sudo apt-get dist-" -"upgrade » dans un terminal pour mettre votre système complètement à jour." -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Les paquets suivants ne seront pas mis à jour :" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Téléchargement de la liste des nouveautés…" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Taille du téléchargement : %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Votre système est à jour" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Vous pouvez installer %s mise à jour" msgstr[1] "Vous pouvez installer %s mises à jour" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Veuillez patienter, cela peut prendre du temps." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "La mise à jour est terminée" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nouvelle version : %s (taille : %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Votre distribution n'est plus supportée" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1023,17 +1017,17 @@ msgstr "" "devez passer à une version plus récente d'Ubuntu Linux. Rendez-vous sur " "http://www.ubuntu.com pour de plus amples informations à ce sujet." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Une nouvelle version « %s » est disponible" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "La liste des logiciels est corrompue" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1529,6 +1523,11 @@ msgstr "Ubuntu 5.04 Mises à jour de sécurité" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Mises à jour de sécurité" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Supporté officiellement" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1570,8 +1569,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Supporté officiellement" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Certains logiciels ne sont plus supportés officiellement" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1643,6 +1643,20 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Certaines mises à jour requièrent la suppression de logiciels " +#~ "supplémentaires. Utilisez la fonction « Sélectionner la totalité des " +#~ "mises à jour » du « Gestionnaire de paquets Synaptic » ou lancez « sudo " +#~ "apt-get dist-upgrade » dans un terminal pour mettre votre système " +#~ "complètement à jour." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Les paquets suivants ne seront pas mis à jour :" + #~ msgid "About %li seconds remaining" #~ msgstr "Environ %li secondes restantes" diff --git a/po/fur.po b/po/fur.po index d8f58fc1..2cc80acf 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz \n" "Language-Team: Friulian \n" @@ -80,45 +80,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Impuarte la clâf" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -126,38 +126,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -166,34 +166,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -216,15 +216,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -232,11 +232,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -249,11 +249,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -262,42 +262,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -306,15 +306,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -323,21 +323,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -346,49 +346,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -398,19 +398,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -470,11 +470,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -484,28 +484,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -513,74 +513,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -795,125 +795,123 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1346,6 +1344,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1383,7 +1386,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/gl.po b/po/gl.po index f2bf7111..e55428b7 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -81,52 +81,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Actualizacións de software" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Fonte" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Fonte" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Erro importando o ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O ficheiro seleccionado pode que non sexa un ficheiro de clave GPG ou que " "esté corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Erro ao quitar a clave" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un " "erro." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -134,38 +134,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -177,23 +177,23 @@ msgstr "" "erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -203,11 +203,11 @@ msgstr "" "erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -230,15 +230,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -246,11 +246,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -263,11 +263,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -276,43 +276,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "Erro ao quitar a clave" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -321,15 +321,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -338,21 +338,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -361,50 +361,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "Xa hai outro xestor de paquetes en execución" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -414,20 +414,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "Actualización rematada" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -488,11 +488,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -502,28 +502,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -531,74 +531,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -826,7 +826,6 @@ msgstr "" msgid "Other updates" msgstr "Instalando actualizacións..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Cannot install all available updates" @@ -834,121 +833,120 @@ msgstr "Comprobando se hai actualizacións..." #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Descargando cambios" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Instalando actualizacións..." msgstr[1] "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "A súa distribución xa non está soportada" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1421,6 +1419,12 @@ msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Soporte oficial" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1464,7 +1468,7 @@ msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Soporte oficial" #. CompDescription diff --git a/po/he.po b/po/he.po index e6b616b3..106ac280 100644 --- a/po/he.po +++ b/po/he.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: Hebrew \n" @@ -84,48 +84,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "עדכוני תוכנה" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "מקור" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "מקור" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "שגיאה בייבוא קובץ נבחר" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -136,19 +136,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "אנא הכניסו תקליטור לכונן:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "חבילות פגומות" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -156,20 +156,20 @@ msgstr "" "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן " "באמצעות synaptic או apt-get לפני שתמשיך." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "חבילה חיונית תוסר בלית ברירה" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -178,34 +178,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "לא ניתן להתקין את \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -228,15 +228,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -244,11 +244,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -261,11 +261,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -274,32 +274,32 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "שגיאה במהלך העדכון" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -307,11 +307,11 @@ msgstr "" "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת " "שלכם ונסו שנית." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "אין מספיק שטח בדיסק הקשיח" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -320,15 +320,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "האם ברצונך להתחיל את השדרוג?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "לא ניתן להתקין את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -337,22 +337,22 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "לא ניתן להוריד את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" "השדרוג בוטל. אנא בדקו את החיבור לאינטרנט או את מדיית ההתקנה ונסו שנית. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -361,50 +361,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_דלג על השלב" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_הסר" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 #, fuzzy msgid "Restoring original system state" msgstr "מאתחל את המערכת" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -416,19 +416,19 @@ msgstr "" "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n" "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "משדרג" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "שדרוג המערכת הושלם." @@ -490,11 +490,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -504,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "חבילה חדשה %s תותקן." msgstr[1] "%s חבילות חדשות יותקנו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "חבילה %s תשודרג." msgstr[1] "%s חבילות ישודרגו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -533,75 +533,75 @@ msgid "" "You have to download a total of %s. " msgstr "יש להוריד %s בסה\"כ." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "השדרוג עשוי לקחת מספר שעות, ולא ניתן לבטלו בשלב מאוחר יותר." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית או מסמך פתוחים." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "לא ניתן למצוא שדרוג זמין" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "המערכת כבר שודרגה." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "הסר %s " -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "התקן %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "שדרג %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "נותרו בערך %li ימים, %li שעות ו-%li דקות." -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "נותרו בערך %li שעות ו-%li דקות." -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -825,129 +825,127 @@ msgstr "משדרג את אובונטו" msgid "Other updates" msgstr "מתקין עדכונים..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "לא ניתן להתקין את כל העדכונים הזמינים" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "גרסה %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "מוריד שינוייים" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "המערכת שלך מעודכנת!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "מתקין עדכונים..." msgstr[1] "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 #, fuzzy msgid "Update is complete" msgstr "ההורדה הושלמה" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "גרסה %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "ההפצה שלך כבר לא נתמכת, סליחה." -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1420,6 +1418,12 @@ msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "נתמך רשמית" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1463,7 +1467,7 @@ msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "נתמך רשמית" #. CompDescription diff --git a/po/hi.po b/po/hi.po index 528a945a..6a509cb7 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Hindi \n" @@ -80,45 +80,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -126,38 +126,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -166,34 +166,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -216,15 +216,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -232,11 +232,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -249,11 +249,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -262,42 +262,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -306,15 +306,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -323,21 +323,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -346,49 +346,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -398,19 +398,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -470,11 +470,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -484,28 +484,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -513,74 +513,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -795,125 +795,123 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1346,6 +1344,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1383,7 +1386,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/hr.po b/po/hr.po index 79eb7a83..52847e7a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" @@ -81,47 +81,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Nadogradnje programa" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Unos ključa" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Greška prilikom uvoženja odabrane datoteke" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Odabrana datoteka možda nije GPG ključ ili je možda oštećena." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Greška prilikom brisanja ključa" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ključ koji ste odabrali se ne može obrisati. Molimo prijavite ovu grešku." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -132,19 +132,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Upišite ime za disk" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Ubacite CD u uređaj:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Pokvareni paketi" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -152,20 +152,20 @@ msgstr "" "Vaš sistem sadrži pokvarene pakete koji nisu mogli biti popravljeni sa ovim " "programom. Popravite ih koristeći synaptic ili apt-get prije nastavljanja." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Ne mogu nadograditi potrebne meta-pakete" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Bitan paket bi morao biti uklonjen" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Nisam mogao riješiti nadogradnju" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -177,11 +177,11 @@ msgstr "" "prijavite ovo kao grešku. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Greška prilikom identificiranja nekih paketa" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -191,12 +191,12 @@ msgstr "" "problem sa mrežom i trebali biste kasnije pokušati ponovo. Pogledajte popis " "neidentificiranih paketa." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Ne mogu instalirati '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -205,11 +205,11 @@ msgstr "" "grešku. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Nisam mogao odrediti meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -237,15 +237,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Čitam spremnik" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -253,11 +253,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Nisam našao ispravan zrcalni poslužitelj" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -277,11 +277,11 @@ msgstr "" "Ako odaberete 'ne' nadogradnja će se prekinuti." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Kreirati uobičajene izvore?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -294,11 +294,11 @@ msgstr "" "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja će " "prekinuti." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Podaci repozitorija neispravni" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -306,11 +306,11 @@ msgstr "" "Nadogradnja podataka repozitorija je rezultirala neispravnom datotekom. " "Molim, prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Izvori trećih strana su isključeni" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -320,11 +320,11 @@ msgstr "" "ih uključiti nakon nadogradnje sa 'software-properties' alatom ili sa " "synapticom." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Greška prilikom nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -332,11 +332,11 @@ msgstr "" "Pojavio se problem prilikom nadogradnje. Obično se radi o mrežnom problemu, " "pa vas molim da provjerite vašu mrežu i pokušate ponovo." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Nema dovoljno praznog mjesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -348,15 +348,15 @@ msgstr "" "koristeći 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Želite li pokrenuti nadogradnju?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Nisam mogao instalirati nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -368,11 +368,11 @@ msgstr "" "Nadogradnja se prekida. Vaš sistem bi mogao biti u neupotrebljivom stanju. " "Obnavljanje je pokrenuto (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Nisam mogao preuzeti nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -380,11 +380,11 @@ msgstr "" "Nadogradnja se prekida. Molim provjerite vašu internet vezu ili " "instalacijski medij i pokušajte ponovo. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Neki paketi više nisu službeno podržani" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -398,23 +398,23 @@ msgstr "" "Ako nemate omogućen 'universe' repozitorij, ovi paketi biti će predloženi za " "uklanjanje. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Ukloniti zastarjele pakete?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Preskoči ovaj korak" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Ukloni" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Greška prilikom čina" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -423,26 +423,26 @@ msgstr "" "više informacija. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Vraćam u početno stanje" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Provjeravam upravitelja paketima" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Nadograđujem podatke repozitorija" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Neispravni podaci paketa" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -455,19 +455,19 @@ msgstr "" "naći.\n" "Ovo upućuje na ozbiljnu grešku, molim prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Pitam za potvrdu" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Nadograđujem" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Tražim zastarjele programe" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Nadogradnja sustava je završena." @@ -530,11 +530,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Nisam našao naredbu 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Pojavila se ozbiljna greška" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -550,7 +550,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -558,7 +558,7 @@ msgstr[0] "%s paket će biti uklonjen." msgstr[1] "%s paketa će biti uklonjena." msgstr[2] "%s paketa će biti uklonjeno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -566,7 +566,7 @@ msgstr[0] "%s novi paket će biti instaliran." msgstr[1] "%s nova paketa će biti instalirana." msgstr[2] "%s novih paketa će biti instalirano." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -574,7 +574,7 @@ msgstr[0] "%s paket će biti nadograđen." msgstr[1] "%s paketa će biti nadograđena." msgstr[2] "%s paketa će biti nadograđeno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -582,7 +582,7 @@ msgid "" "You have to download a total of %s. " msgstr "Morate preuzeti ukupno %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -591,68 +591,68 @@ msgstr "" "Nadogradnja može potrajati nekoliko sati i ne može biti prekinuta niti u " "jednom trenutku." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Nisam mogao naći niti jednu nadogradnju" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Vaš sustav je već nadograđen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Ukloni %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Instaliraj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Nadogradi %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Otprilike je ostalo %li dana %li say i %li minuta" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Otprilike je ostalo %li sati i %li minuta" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Potrebno je ponovno pokretanje računala" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -894,77 +894,71 @@ msgstr "Nadogradi na zadnju verziju Ubuntua" msgid "Other updates" msgstr "_Instaliraj nadogradnje" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Ne mogu instalirati sve dostupne nadogradnje" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Neke nadogradnje zahtijevaju uklanjanje pojedinih programa. Upotrijebite " -"opciju \"Označi sve nadogradnje\" upravitelja paketima \"Synaptic\" ili " -"upišite \"sudo apt-get dist-upgrade\" u terminalu za potpunu nadogradnju " -"vašeg sistema." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Slijedeći paketi će biti preskočeni:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Verzija %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Preuzimam popis promjena..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Veličina preuzimanja: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Vaš sustav sadrži posljednje nadogradnje" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -972,35 +966,35 @@ msgstr[0] "Možete instalirati %s nadogradnju" msgstr[1] "Možete instalirati %s nadogradnje" msgstr[2] "Možete instalirati %s nadogradnji" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nova verzija: %s (Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verzija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Vaša distibucija više nije podržana" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1010,17 +1004,17 @@ msgstr "" "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više " "detalja o nadogradnji." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Popis programa je oštećen" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1504,6 +1498,12 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Službeno podržani" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1546,8 +1546,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "Službeno podržani" +msgid "No longer oficially supported" +msgstr "Neki paketi više nisu službeno podržani" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1618,6 +1618,19 @@ msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima" msgid "Non-DFSG-compatible Software" msgstr "DFSG-nekompatibilni programi" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Neke nadogradnje zahtijevaju uklanjanje pojedinih programa. Upotrijebite " +#~ "opciju \"Označi sve nadogradnje\" upravitelja paketima \"Synaptic\" ili " +#~ "upišite \"sudo apt-get dist-upgrade\" u terminalu za potpunu nadogradnju " +#~ "vašeg sistema." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Slijedeći paketi će biti preskočeni:" + #~ msgid "About %li seconds remaining" #~ msgstr "Otprilike je ostalo %li sekundi" diff --git a/po/hu.po b/po/hu.po index c66d7cc6..b6efe310 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -80,47 +80,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Szoftverfrissítések" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Kulcs importálása" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem, jelentse ezt hibaként." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,19 +131,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Kérem, adja meg a lemez nevét" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Törött csomagok" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -152,20 +152,20 @@ msgstr "" "javíthatóak. Kérem, először javítsa ki őket a synaptic vagy az apt-get " "segítségével." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "A szükséges meta-csomagok nem frissíthetőek" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Egy alapvető csomag eltávolításra kerülne" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Nem tudom megtervezni a frissítés menetét" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -177,11 +177,11 @@ msgstr "" "jelentse ezt hibaként. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -191,23 +191,23 @@ msgstr "" "hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az alábbi " "lista a hitelesíthetetlen csomagokat tartalmazza." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "'%s' nem telepíthető" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Egy szükséges csomag nem telepíthető. Kérem, jelentse ezt hibaként. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Nem tudom megállapítani a meta-csomagot" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -236,15 +236,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Gyorsítótár beolvasása" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -252,11 +252,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "nem található érvényes tükör" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -277,11 +277,11 @@ msgstr "" "A \"Nem\" kiválasztása megszakítja a frissítést." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Alapértelmezett források ismételt előállítása?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,11 +295,11 @@ msgstr "" "Kíván alapértelmezett bejegyzéseket adni a következőhöz: %s? Ha a Nem " "gombott választja, a frissítés félbeszakad." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Érvénytelen csomagtároló információ" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -307,11 +307,11 @@ msgstr "" "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, " "jelentse ezt hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "A külső források letiltva" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -321,11 +321,11 @@ msgstr "" "a frissítés után a Szoftvertulajdonságok eszközzel, vagy a Synaptic " "csomagkezelővel." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Hiba történt a frissítés közben" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -333,11 +333,11 @@ msgstr "" "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." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Nincs elég szabad hely a merevlemezen" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -349,15 +349,15 @@ msgstr "" "fájljait a \"sudo apt-get clean\" parancs kiadásával." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Biztosan el szeretné kezdeni a frissítést?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "A frissítések nem telepíthetők" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -369,11 +369,11 @@ msgstr "" "A frissítés most félbeszakad. Előfordulhat, hogy a rendszer használhatatlan " "állapotban van. Egy helyreállítás került futtatásra (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "A frissítések nem tölthetők le" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -381,11 +381,11 @@ msgstr "" "A frissítés most félbeszakad. Kérem, ellenőrizze a hálózati kapcsolatot vagy " "a telepítő médiát és próbálja újra. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Néhány szoftver már nincs hivatalosan támogatva" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -399,23 +399,23 @@ msgstr "" "Ha nincs engedélyezve a \"universe\" tároló, akkor ezek a csomagok a " "következő lépésben ki lesznek jelölve eltávolításra. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Eltávolítja az elavult csomagokat?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "Ezen lé_pés kihagyása" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Eltávolítás" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Hiba a módosítások rögzítése közben" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -424,26 +424,26 @@ msgstr "" "információkat tartalmaz a hibára vonatkozóan. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "A rendszer eredeti állapotának helyreállítása" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Csomagkezelő ellenőrzése" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Csomagtároló információ frissítése" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Érvénytelen csomaginformációk" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -456,19 +456,19 @@ msgstr "" "található többé.\n" "Ez egy komoly problémát jelez, jelentse hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Megerősítés kérése" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Frissítés folyamatban" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Elavult szoftverek keresése" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "A rendszer frissítése befejeződött." @@ -532,11 +532,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "A 'diff' parancs nem található" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Végzetes hiba történt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -552,25 +552,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s csomag el lesz távolítva." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s új csomag kerül telepítésre." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s csomag frissítve lesz." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -578,7 +578,7 @@ msgid "" "You have to download a total of %s. " msgstr "Összes letöltendő adatmennyiség: %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -587,70 +587,70 @@ msgstr "" "A frissítés több órát is igénybe vehet és a későbbiek során nem lehet " "bármikor megszakítani." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 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." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Nincs elérhető frissítés" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Az Ön rendszere már frissítve lett." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "%s eltávolítása" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "%s telepítése" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "%s frissítése" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Kb. %li nap, %li óra és %li perc van hátra" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Kb. %li óra és %li perc van hátra" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Újraindítás szükséges" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -890,111 +890,105 @@ msgstr "Frissítés az Ubuntu legújabb változatára" msgid "Other updates" msgstr "_Telepítés" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Nem telepíthető minden rendelkezésre álló frissítés" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Néhány frissítés további szoftverek eltávolítását igényli. Használja a " -"Synaptic csomagkezelő \"Minden frissítés kijelölése\" funkcióját, vagy " -"futtassa terminálból a \"sudo apt-get dist-upgrade\" parancsot a rendszer " -"teljes frissítéshez." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "A következő frissítések ki lesznek hagyva:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "%s verzió: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Módosítások listájának letöltése..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Letöltés mérete: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "A rendszere naprakész" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s frissítést telepíthet" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Kis türelmet, ez eltarthat egy ideig." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "A frissítés befejeződött" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Új verzió: %s (Méret: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "%s verzió: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "A terjesztés már nem támogatott" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1004,17 +998,17 @@ msgstr "" "Frissítsen az Ubuntu Linux egy újabb változatára. A frissítéssel kapcsolatos " "információkat az http://www.ubuntu.com weboldalon talál." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "A disztribúció új \"%s\" kiadása elérhető" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "A szoftverindex sérült" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1501,6 +1495,12 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Hivatalosan támogatott" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1543,8 +1543,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "Hivatalosan támogatott" +msgid "No longer oficially supported" +msgstr "Néhány szoftver már nincs hivatalosan támogatva" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1615,6 +1615,19 @@ msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Néhány frissítés további szoftverek eltávolítását igényli. Használja a " +#~ "Synaptic csomagkezelő \"Minden frissítés kijelölése\" funkcióját, vagy " +#~ "futtassa terminálból a \"sudo apt-get dist-upgrade\" parancsot a rendszer " +#~ "teljes frissítéshez." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "A következő frissítések ki lesznek hagyva:" + #~ msgid "About %li seconds remaining" #~ msgstr "Kb. %li másodperc van hátra" diff --git a/po/id.po b/po/id.po index 1db79502..5714019a 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" @@ -79,48 +79,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Perangkat Lunak Mutakhir" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Impor kunci" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Kesalahan mengimpor berkas terpilih" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Berkas terpilih mungkin bukan berkas kunci GPG atau berkas mungkin korup." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Kesalahan menghapus kunci" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Berkas yang anda pilih tidak dapat dihapus. Silakan laporkan ini sebagai bug." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,19 +131,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Silakan masukkan nama untuk cakram" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Silakan masukan cakram ke dalam penggerak" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Paket rusak" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -152,20 +152,20 @@ msgstr "" "perangkat lunak ini. Silakan perbaiki terlebih dahulu dengan menggunakan " "synaptic atau apt-get sebelum melanjutkan hal ini." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Paket esensial akan dihapus" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menghitung pemutakhiran" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -177,11 +177,11 @@ msgstr "" "bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Kesalahan membuktikan keabsahan beberapa paket" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -191,12 +191,12 @@ msgstr "" "mungkin karena masalah pada jaringan. Anda dapat mencobanya beberapa saat " "lagi. Lihat senarai dari paket yang belum terbukti keabsahnya dibawah ini." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat menginstal '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -205,11 +205,11 @@ msgstr "" "ini sebagai bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Tidak dapat menebak meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -238,15 +238,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Membaca cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -254,11 +254,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Tidak menemukan mirror yang valid" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -278,11 +278,11 @@ msgstr "" "Jika anda pilih 'no' pemutakhiran akan dibatalkan." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Membuat sumber baku?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,11 +295,11 @@ msgstr "" "Haruskah entri baku untuk '%s' ditambahkan? Jika anda pilih 'No' " "pemutakhiran akan dibatalkan." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Informasi gudang tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -307,11 +307,11 @@ msgstr "" "Meng-upgrade informasi gudang berakhir di dalam berkas yang tidak benar. " "Silakan laporkan ini sebagai bug." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Sumber dari pihak ketiga dilumpukan" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -321,11 +321,11 @@ msgstr "" "dapat mengaktifkan kembali setelah upgrade dengan alat 'software-properties' " "atau dengan synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Kesalahan pada waktu pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -333,11 +333,11 @@ msgstr "" "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah " "jaringan, silakan periksa koneksi jaringan anda dan ulangi." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Kapasitas cakram tidak mencukupi" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -349,15 +349,15 @@ msgstr "" "instalasi terdahulu dengan menggunakan 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Apakah anda ingin memulai pemutakhiran?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Tidak dapat menginstal pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -369,11 +369,11 @@ msgstr "" "Upgrade dibatalkan sekarang. Sistem anda dapat menjadi tidak dapat " "digunakan. Perbaikan sedang berjalan (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Tidak dapat mengunduh pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -381,11 +381,11 @@ msgstr "" "Upgrade dibatalkan sekarang. Silakan periksa koneksi internet anda atau " "media instalasi dan coba lagi nanti. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -399,23 +399,23 @@ msgstr "" "Jika anda tidak mengaktifkan komponen 'universe' paket ini akan diajurkan " "untuk penghapusan dalam langkah selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Hapus paket usang?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Lewati Langkah Ini" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Hapus" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Kesalahan pada waktu commit" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -424,26 +424,26 @@ msgstr "" "bawah untuk informasi lebih lanjut. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Sistem dikembalikan ke keadaan awal" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Memeriksa manajer paket" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Memutakhirkan informasi gudang" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Informasi paket tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -457,19 +457,19 @@ msgstr "" "Ini mengindikasikan adanya kesalahan serius, silakan laporkan ini sebagai " "bug." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Menanyakan konfigurasi" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Meng-upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Mencari perangkat lunak usang" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Upgrade sistem telah selesai." @@ -532,11 +532,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Perintah 'diff' tidak dapat ditemukan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Terjadi kesalahan fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -551,25 +551,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paket akan dihapus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s paket baru akan diinstal." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paket akan diupgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -577,7 +577,7 @@ msgid "" "You have to download a total of %s. " msgstr "Anda harus mengunduh sebanyak %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -586,69 +586,69 @@ msgstr "" "Upgrade membutuhkan waktu beberapa jam dan tidak dapat dibatalkan setelah " "itu." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Untuk mencegah kehilangan data silakan tutup seluruh aplikasi dan dokumen." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Tidak dapat menemukan upgrade apapun" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Sistem anda telah diupgrade" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Hapus %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Instal %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Sekitar %li hari %li jam %li menit lagi" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Sekitar %li jam %li menit lagi" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Diperlukan reboot" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -885,111 +885,105 @@ msgstr "Upgrade ke versi Ubuntu terakhir" msgid "Other updates" msgstr "_Instal Update" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Beberapa pemutakhiran butuh penghapusan perangkat lunak yang ada. Gunakan " -"fungsi \"Mark All Upgrades\" dari paket manajer paket \"Synaptic\" atau " -"jalankan \"sudo apt-get dist-upgrade\"\" dalam terminal untuk memutakhirkan " -"sistem anda." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Pemutakhiran berikut akan dilewati:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versi %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Mengunduh senarai dari perubahan..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Ukuran unduh: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Sistem anda telah up-to-date" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Anda dapat instal %s pemutakhiran" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Pemutakhiran selesai" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versi baru: %s (Ukuran: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versi %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Distribusi anda tidak disokong lagi" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -999,17 +993,17 @@ msgstr "" "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www." "ubuntu.com untuk informasi lebih lanjut." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Luncuran distribusi baru '%s' telah tersedia" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Indeks perangkat lunak telah rusak" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1494,6 +1488,12 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Resmi disokong" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1535,8 +1535,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "Resmi disokong" +msgid "No longer oficially supported" +msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1609,6 +1609,19 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Beberapa pemutakhiran butuh penghapusan perangkat lunak yang ada. Gunakan " +#~ "fungsi \"Mark All Upgrades\" dari paket manajer paket \"Synaptic\" atau " +#~ "jalankan \"sudo apt-get dist-upgrade\"\" dalam terminal untuk " +#~ "memutakhirkan sistem anda." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Pemutakhiran berikut akan dilewati:" + #~ msgid "About %li seconds remaining" #~ msgstr "Sekitar %li detik lagi" diff --git a/po/it.po b/po/it.po index 37465507..a9c5d7df 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -81,52 +81,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Aggiornamenti Software" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Sorgente" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Sorgente" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importa chiave" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Errore nell'importare il file selezionato" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe " "essere corrotto." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Errore nel rimuovere la chiave" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La chiave selezionata non può essere rimossa. Notificare questo evento come " "bug." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -137,19 +137,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Inserire un nome per il disco" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Inserire un disco nell'unità:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Pacchetti non integri" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -158,20 +158,20 @@ msgstr "" "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get" "\" per risolvere il probelma." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Impossibile aggiornare i meta-pacchetti richiesti" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Un pacchetto essenziale dovrebbe essere rimosso" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'aggiornamento" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -183,11 +183,11 @@ msgstr "" "dell'aggiornamento. Notificare questo evento come bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Errore nell'autenticare alcuni pacchetti" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -197,12 +197,12 @@ msgstr "" "un problema di rete passeggero, riprovare più tardi. Segue una lista di " "pacchetti non autenticati." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Impossibile installare \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,11 +211,11 @@ msgstr "" "evento come bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -244,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Lettura della cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -260,11 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Non è stato trovato alcun mirror valido" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +285,11 @@ msgstr "" "Scegliendo di no, l'aggiornamento verrà annullato." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Generare le sorgenti predefinite?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +303,11 @@ msgstr "" "Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento " "verrà annullato." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Informazioni sul repository non valide" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,11 +315,11 @@ msgstr "" "L'aggiornamento delle informazioni sul repository ha generato un file non " "valido. Notificare questo evento come bug." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Sorgenti di terze parti disabilitate" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -329,11 +329,11 @@ msgstr "" "list». È possibilie abilitarle di nuovo dopo l'aggiornamento con lo " "strumento «software-properties» o con synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Errore durante l'aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -341,11 +341,11 @@ msgstr "" "Si è verificato un problema durante l'aggiornamento. Solitamente si tratta " "di problemi di rete, controllare la connessione di rete e riprovare." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Spazio libero su disco insufficiente" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +357,15 @@ msgstr "" "usando \"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Iniziare l'aggiornamento?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Impossibile installare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -378,11 +378,11 @@ msgstr "" "uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -" "a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Impossibile scaricare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -390,11 +390,11 @@ msgstr "" "Interruzione immediata dell'aggiornamento. Controllare la connessione a " "internet o il supporto di installazione e riprovare. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Software non più supportato ufficialmente" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -409,23 +409,23 @@ msgstr "" "Se non è abilitato il repository «universe», verrà suggerita la rimozione di " "questi pacchetti al prossimo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Rimuovere i pacchetti obsoleti?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Salta questo passo" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Rimuovi" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Errore durante il commit" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,26 +434,26 @@ msgstr "" "seguente per maggiori informazioni. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Ripristino stato originale del sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Controllo gestore dei pacchetti" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Aggiornamento delle informazione sui repository" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Informazioni di pacchetto non valide" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -466,19 +466,19 @@ msgstr "" "trovare il pacchetto essenziale «%s».\n" "Ciò indica un errore grave, segnalare questo evento come un bug." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Richiesta di conferma" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Ricerca di software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "L'aggiornamento del sistema è stato completato." @@ -541,11 +541,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Il comando \"diff\" non è stato trovato" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Si è verificato un errore fatale" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -561,28 +561,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pacchetto sta per essere rimosso." msgstr[1] "%s pacchetti stanno per essere rimossi." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s nuovo pacchetto sta per essere installato." msgstr[1] "%s nuovi pacchetti stanno per essere installati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pacchetto sta per essere aggiornato." msgstr[1] "%s pacchetti stanno per essere aggiornati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -590,7 +590,7 @@ msgid "" "You have to download a total of %s. " msgstr "È necessario scaricare un totale di %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -599,70 +599,70 @@ msgstr "" "L'aggiornamento può richiedere diverse ore e non può essere annullato in " "nessun momento successivo." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 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." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Impossibile trovare aggiornamenti" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Il sistema è già stato aggiornato." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Rimuovere %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Installare %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Aggiornare %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Circa %li giorni, %li ore e %li minuti rimanenti" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Circa %li ore e %li minuti rimanenti" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Riavvio richiesto" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?" @@ -904,112 +904,106 @@ msgstr "Aggiorna all'ultima versione di Ubuntu" msgid "Other updates" msgstr "Installazione degli aggiornamenti" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Impossibile installare tutti gli aggiornamenti disponibili" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Alcuni aggiornamenti richiedono la rimozione di altri programmi. Utilizzare " -"la funzione \"Marca tutti gli aggiornamenti\" del gestore di pacchetti " -"\"Synaptic\" o inserire il comando \"sudo apt-get dist-upgrade\" in un " -"terminale per aggiornare completamente il sistema." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "I seguenti aggiornamenti saranno tralasciati:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versione %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Scaricamento dell'elenco dei cambiamenti..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Dati da scaricare: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Il sistema è aggiornato!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "È possibile installare %s aggiornamento" msgstr[1] "È possibile installare %s aggiornamenti" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Attendere, l'operazione potrebbere richiedere del tempo." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Aggiornamento completato" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nuova versione: %s (Dimensione: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versione %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "La distribuzione in uso non è più supportata" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1019,17 +1013,17 @@ msgstr "" "versione più aggiornata di Ubuntu Linux. Per maggiori informazioni " "consultare http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "L'indice dei programmi è rovinato" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1522,6 +1516,11 @@ msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Supportato ufficialmente" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1564,8 +1563,9 @@ msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Supportato ufficialmente" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Software non più supportato ufficialmente" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1634,6 +1634,19 @@ msgstr "Software compatibile con le DFSG con dipendenze non libere" msgid "Non-DFSG-compatible Software" msgstr "Software non compatibile con le DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Alcuni aggiornamenti richiedono la rimozione di altri programmi. " +#~ "Utilizzare la funzione \"Marca tutti gli aggiornamenti\" del gestore di " +#~ "pacchetti \"Synaptic\" o inserire il comando \"sudo apt-get dist-upgrade" +#~ "\" in un terminale per aggiornare completamente il sistema." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "I seguenti aggiornamenti saranno tralasciati:" + #~ msgid "About %li seconds remaining" #~ msgstr "Circa %li secondi rimanenti" diff --git a/po/ja.po b/po/ja.po index 393fac1d..67e4b650 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu Japanese Team \n" @@ -81,49 +81,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "ソフトウェアのアップデート" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "ソース" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "ソース" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "鍵のインポート" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "選択したファイルのインポートエラー" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "選択したファイルはGPG鍵ファイルではないか、壊れている可能性があります。" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "鍵削除のエラー" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択した鍵を削除できませんでした。バグとして報告してください。" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -134,19 +134,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "ディスク名を入力してください" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "ディスクをドライブに挿入してください:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "壊れたパッケージ" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -154,20 +154,20 @@ msgstr "" "システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま" "す。 Synaptic や apt-get を使って最初に修正してください。" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "要求されたメタパッケージがアップグレードできません" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "必須パッケージが削除されます" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "アップグレードが算定できません" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -177,11 +177,11 @@ msgid "" msgstr "算定中に解決できない問題がおきました。バグとして報告してください。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "いくつかのパッケージが認証されませんでした" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -191,12 +191,12 @@ msgstr "" "クの問題でしょう。あとで再び試してみてください。下に認証できなかったパッケー" "ジが表示されます。" -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "'%s' がインストールできません" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -204,11 +204,11 @@ msgstr "" "要求されたパッケージのインストールができません。バグとして報告してください。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "メタパッケージを推測できません" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -237,15 +237,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "キャッシュを読み込み中" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -253,11 +253,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "正しいミラーが見つかりません" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -276,11 +276,11 @@ msgstr "" "キャンセルします。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "標準のソースを生成しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -293,11 +293,11 @@ msgstr "" "'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートを" "キャンセルします。" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "リポジトリ情報が無効です" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -305,11 +305,11 @@ msgstr "" "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報" "告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "公式ではないソースが無効になりました" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -319,11 +319,11 @@ msgstr "" "アップグレード後に 'ソフトウェアのプロパティ' ツールか Synaptic を使用してく" "ださい。" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "アップデート中にエラー発生" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -331,11 +331,11 @@ msgstr "" "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。" "ネットワーク接続をチェックし、再びアップデートしてください。" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "ディスクの空き領域が足りません" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -347,15 +347,15 @@ msgstr "" "た一時パッケージを削除してください。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "アップグレードを開始しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "アップグレードをインストールできません" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -367,11 +367,11 @@ msgstr "" "アップグレードを中断しました。システムが使用できない状態になっている可能性が" "あります。ただいま修正を実行中です (dpkg --configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "アップグレードをダウンロードできません" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -379,11 +379,11 @@ msgstr "" "アップグレードを中断しました。インターネット接続またはインストールメディア" "(CD-ROMなど)をチェックし。再試行してください。 " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "いくつかのソフトウェアはもう公式にサポートされません" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -397,23 +397,23 @@ msgstr "" "'universe' を有効にしないと、これらのパッケージは次のステップで削除することを" "提案します。 " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "不要なパッケージを削除しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "このステップをスキップ(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "削除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "コミット中にエラー" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -422,26 +422,26 @@ msgstr "" "ください。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "システムを元に戻し中" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "パッケージマネージャをチェック中" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "リポジトリ情報をアップデート" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "無効なパッケージ情報" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -453,19 +453,19 @@ msgstr "" "パッケージ情報のアップデートのあと、重要パッケージ '%s' が見つかりません。\n" "このメッセージは深刻なエラーです。バグとして報告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "確認する" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "アップグレード中" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "古いソフトウェアを検索する" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "システムのアップグレードが完了しました。" @@ -528,11 +528,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "'diff' コマンドが見つかりません" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "重大なエラーが発生しました" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -547,25 +547,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s つのパッケージが削除されます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s·つのパッケージがインストールされます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s·つのパッケージがアップグレードされます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -573,77 +573,77 @@ msgid "" "You have to download a total of %s. " msgstr "全部で %s つのパッケージをダウンロードする必要があります。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "アップグレードには数時間かかり、今後一切キャンセルはできません。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "データの損失を避けるため、すべてのアプリケーションとドキュメントを閉じてくだ" "さい。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "アップグレードが見つかりません" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "システムはすでに最新の状態です。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "削除されるパッケージ: %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "インストール %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "アップグレード %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "およそ残り %li 日 %li 時間 %li 分" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "およそ残り %li 時間 %li 分" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "再起動してください" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "アップグレードが終了しました。再起動が必要ですが、すぐに実行しますか？" @@ -879,111 +879,105 @@ msgstr "Ubuntu の最新バージョンにアップグレード" msgid "Other updates" msgstr "アップデートをインストール中" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "すべてのアップデートをインストールすることができません" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"ほかのソフトを削除しなければならないアップデートがあります。完全にアップグ" -"レードするためにはパッケージマネージャ \"Synaptic\" の \"すべてのアップグレー" -"ドににマーク\"機能を使うか。端末から \"sudo apt-get dist-upgrade\" を実行して" -"ください。" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "これらのパッケージはアップグレードされません:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "バージョン %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "変更点を取得中..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "ダウンロードサイズ: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "システムは最新の状態です!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 個のアップデートがインストールされます" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "しばらくお待ちください。少々時間がかかります。" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "アップデートが完了しました" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新しいバージョン: %s (サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "バージョン %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "このディストリビューションはすでにサポート対象外です" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -993,17 +987,17 @@ msgstr "" "Ubuntu Linux にアップグレードしてください。\r\n" "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "ソフトウェアのインデックスが壊れています" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1490,6 +1484,11 @@ msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "公式サポート" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1531,8 +1530,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "公式サポート" +#, fuzzy +msgid "No longer oficially supported" +msgstr "いくつかのソフトウェアはもう公式にサポートされません" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1602,6 +1602,19 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア" msgid "Non-DFSG-compatible Software" msgstr "DFSGに適合しないソフトウェア" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "ほかのソフトを削除しなければならないアップデートがあります。完全にアップグ" +#~ "レードするためにはパッケージマネージャ \"Synaptic\" の \"すべてのアップグ" +#~ "レードににマーク\"機能を使うか。端末から \"sudo apt-get dist-upgrade\" を" +#~ "実行してください。" + +#~ msgid "The following updates will be skipped:" +#~ msgstr "これらのパッケージはアップグレードされません:" + #~ msgid "About %li seconds remaining" #~ msgstr "およそ残り %li 秒" diff --git a/po/ka.po b/po/ka.po index 244859fd..d80fcac3 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian \n" @@ -82,49 +82,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "პროგრამული განახლებები" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "გასაღების იმპორტი" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "ამორჩეული ფაილის იმპორტი ვერ მოხერხდა" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "ამორჩეული ფაილი შეიძლება არ იყოს GPG გასაღების ფაილი ან შეიძლება იყოს " "დაზიანებული." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "გასღების წაშლა ვერ მოხერხდა" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -135,19 +135,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "შეიყვანეთ დისკის სახელი" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "მოათავსეთ დისკი დისკწამყვანში:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "გაფუჭებული პაკეტები" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -156,22 +156,22 @@ msgstr "" "პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და " "შემდეგ გააგრძელეთ." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 #, fuzzy msgid "A essential package would have to be removed" msgstr "A არსებითი -სკენ" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 #, fuzzy msgid "Could not calculate the upgrade" msgstr "არა" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -183,11 +183,11 @@ msgstr "" "ხარვეზი. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -197,23 +197,23 @@ msgstr "" "ბრაკი. იქნებ მოგვიანბით კიდევ ერთხელ სცადოთ. ქვევით იხილეთ არა-" "ავთენთიფიცერული პაკეტების სია." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "'%s' ვერ დაყენდა" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "მეტა-პაკეტი ვერ გამოვიცანით" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -240,15 +240,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "მიმდინარეობს ქეშის წაკითხვა" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -256,11 +256,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "არავითარი გამოსადეგი სერვერის ანარეკლი" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -273,12 +273,12 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 #, fuzzy msgid "Generate default sources?" msgstr "გენერაცია ნაგულისხმევი?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -287,11 +287,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "რეპოზიტორიების ინფორმაცია არასწორეა" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -299,12 +299,12 @@ msgstr "" "რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ " "ხარვეზი." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 #, fuzzy msgid "Third party sources disabled" msgstr "გამორთული" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 #, fuzzy msgid "" "Some third party entries in your souces.list were disabled. You can re-" @@ -312,11 +312,11 @@ msgid "" "synaptic." msgstr "-ში სია გამორთული თქვენ პარამეტრები ან." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "განახლებისას მოხდა შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -324,11 +324,11 @@ msgstr "" "განახლებისას მოხდა შეცდომა. ეს როგროც წესი არის კავშირის პრობლემა, შეამოწმეთ " "თქვენი კავშირი და ცადეთ კიდევ ერთხელ." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -337,16 +337,16 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "გნებავთ განახლების დაწყება?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 #, fuzzy msgid "Could not install the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -356,24 +356,24 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "ახლა -ში A a." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 #, fuzzy msgid "Could not download the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 #, fuzzy msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "ახლა ან და " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 #, fuzzy msgid "Some software no longer officially supported" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 #, fuzzy msgid "" "These installed packages are no longer officially supported, and are now " @@ -383,24 +383,24 @@ msgid "" "removal in the next step. " msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "წავშალო მოძველებული პაკეტები?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "ნაბიჯის გა_მოტოვება" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_წაშლა" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 #, fuzzy msgid "Error during commit" msgstr "შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 #, fuzzy msgid "" "Some problem occured during the clean-up. Please see the below message for " @@ -408,26 +408,26 @@ msgid "" msgstr "-თვის ინფორმაცია " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "ვამოწმებ პროგრამულ მენეჯერს" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "რეპოზტორიის ინფორმაციის განახლება" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "გაფუჭებული პაკეტის შესახებ ინფორმაცია" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -437,21 +437,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 #, fuzzy msgid "Asking for confirmation" msgstr "-თვის" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "მიმდინარეობს განახლებების ჩაყენება" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 #, fuzzy msgid "Searching for obsolete software" msgstr "ვეძებ -თვის" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 #, fuzzy msgid "System upgrade is complete." msgstr "სისტემა ტოლია სრული." @@ -514,12 +514,12 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "არა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 #, fuzzy msgid "A fatal error occured" msgstr "A შეცდომა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -530,25 +530,25 @@ msgstr "a და შემცველობა და -ში ახლა თ #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -556,76 +556,76 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "საათი და ნებისმიერი დრო." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 #, fuzzy msgid "To prevent data loss close all open applications and documents." msgstr "ვის დახურვა ყველა გახსნა და დოკუმენტები." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "ვერ ვპოულობ განახლებებს" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "თქვენი სისტემა სულ ახლახანს განახლდა." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr " ამოშლა %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "დაყენება %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "ჩასაყენებელი განახლება %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "საჭიროა გადატვირთვა" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 #, fuzzy msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" @@ -865,111 +865,106 @@ msgstr "განახლება -სკენ ვერსია ის" msgid "Other updates" msgstr "განახლებების _დაყენება" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება" #: ../UpdateManager/UpdateManager.py:267 -#, fuzzy msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" -"ის გამოყენება მონიშვნა ყველა ის Synaptic ან sudo -ში a ტერმინალი -სკენ " -"განახლება." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "ვერსია %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "მიმდინარეობს ჩამოქაჩვა სია ის." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "ჩამოსატვირთის ზომა: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "თქვენი სისტემა განახლებულია" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "განახლება გასრულებულია" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "ახალი ვერსია: %s (ზომა: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "ვერსია %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 #, fuzzy msgid "" "You will not get any further security fixes or critical updates. Upgrade to " @@ -979,17 +974,17 @@ msgstr "" "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი " "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "პროგრამების სიის ინდექსი დაზიანებულია" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 #, fuzzy msgid "" "It is impossible to install or remove any software. Please use the package " @@ -1475,6 +1470,11 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1516,8 +1516,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "" +#, fuzzy +msgid "No longer oficially supported" +msgstr "არა" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1592,6 +1593,15 @@ msgstr "პროგრამა თავისუფალი დამოკ msgid "Non-DFSG-compatible Software" msgstr "პროგრამა" +#, fuzzy +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "ის გამოყენება მონიშვნა ყველა ის Synaptic ან sudo -ში a ტერმინალი -სკენ " +#~ "განახლება." + #, fuzzy #~ msgid "Download is complete" #~ msgstr "ჩამოტვირთვა ტოლია სრული" diff --git a/po/ko.po b/po/ko.po index 1637fd34..539fe6e8 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl \n" "Language-Team: Korean \n" @@ -80,46 +80,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "소프트웨어 업데이트" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "키 가져오기" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "선택한 파일 가져오기 오류" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못된 것입니다." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "키 삭제 오류" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -130,19 +130,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "디스크에 사용할 이름을 입력하십시오." -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "드라이브에 디스크를 넣으십시오:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "망가진 꾸러미" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -150,20 +150,20 @@ msgstr "" "이 소프트웨어로 수정할 수 없는 망가진 꾸러미가 있습니다. 진행 전에 먼저 시냅" "틱이나 apt-get을 사용하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "요청된 메타 꾸러미를 업그레이드 할 수 없습니다" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "필수 꾸러미를 지워야만 합니다." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -175,11 +175,11 @@ msgstr "" "버그를 보고하여 주십시오. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "꾸러미 인증 오류" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,23 +188,23 @@ msgstr "" "인증하는데 실패한 꾸러미가 있습니다. 일시적인 네트워크 문제일 수 있으니 나중" "에 다시 시도하십시오. 인증에 실패한 꾸러미의 목록은 다음과 같습니다." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "'%s'을(를) 설치할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "요청된 꾸러미를 설치할 수 없습니다. 버그로 보고하여 주십시오. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "메타 꾸러미를 추측할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -232,15 +232,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "캐시를 읽는 중" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -248,11 +248,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "적합한 미러 서버를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -272,11 +272,11 @@ msgstr "" "'아니오'를 고르면 업데이트가 취소됩니다." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "기본 설정된 소스 목록을 만듭니까?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -289,11 +289,11 @@ msgstr "" "'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 고르면 업데이트가 취소됩" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "저장소 정보가 올바르지 않습니다" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -301,11 +301,11 @@ msgstr "" "저장소 정보를 업그레이드하는 것이 잘못된 파일로 만들어졌습니다. 버그를 보고하" "여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "써드 파티 소스는 이용할 수 없습니다" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -315,11 +315,11 @@ msgstr "" "properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하게 할 수 있습" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "업데이트 중 오류" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -327,11 +327,11 @@ msgstr "" "업데이트를 하는 동안에 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많습" "니다. 네트워크의 연결 상태를 확인하시고 다시 시도하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "디스크 여유 공간이 충분하지 않습니다." -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +343,15 @@ msgstr "" "에 사용했던 임시 꾸러미들을 삭제하시기 바랍니다." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "업그레이드를 설치하지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,11 +363,11 @@ msgstr "" "업그레이드가 중지되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. " "(dpkg --configure -a)를 실행하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "업그레이드 파일을 다운로드 할 수 없습니다." -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -375,11 +375,11 @@ msgstr "" "업그레이드가 중지되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도" "하십시오. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -393,23 +393,23 @@ msgstr "" "'Universe' 저장소를 활성화하지 않았다면 다음 단계에서 이 꾸러미들을 삭제할 " "수 있습니다. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "못쓰게 된 꾸러미를 삭제하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "이 단계 건너뛰기(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "삭제(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "커밋 도중 오류 발생" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -418,26 +418,26 @@ msgstr "" "보를 얻으실 수 있습니다. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "시스템을 원상태로 복구하는 중" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "꾸러미 관리자 확인 중" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "저장소 정보 업데이트 중" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "잘못된 꾸러미 정보" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -450,19 +450,19 @@ msgstr "" "다.\n" "심각한 오류입니다. 버그를 보고하여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "확인을 요청하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "업그레이드 하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "못 쓰게 된 소프트웨어를 검색하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "시스템 업그레이드가 끝났습니다." @@ -525,11 +525,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "'diff' 명령어를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "심각한 오류 발생" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -543,25 +543,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "꾸러미 %s 개가 삭제될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "새로운 꾸러미가 %s 개 설치될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "꾸러미가 %s 개 업그레이드 될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -569,75 +569,75 @@ msgid "" "You have to download a total of %s. " msgstr "총 %s개의 꾸러미를 다운로드 합니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "업그레이드는 여러 시간이 걸릴 수 있고, 어떤 때에도 취소될 수 없습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문서를 닫으십시오." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "어떤 업그레이드 꾸러미도 찾을 수 없습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "이미 시스템이 업그레이드 되어 있습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "%s 삭제" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "%s 설치" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "%s 업그레이드" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "%li 일 %li 시간 %li 분 정도 남았음" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "%li 시간 %li 분 정도 남았음" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "재부팅이 필요합니다." -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -874,110 +874,105 @@ msgstr "우분투 최신 버젼으로 업그레이드 합니다." msgid "Other updates" msgstr "업데이트를 설치(_I)" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "설치할 수 없는 업데이트가 있습니다" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"어떤 업데이트는 설치하려면 다른 소프트웨어를 삭제해야 합니다. \"시냅틱\" 꾸러" -"미 관리자의 \"모든 업그레이드 하기\" 기능을 사용하거나 터미널에서 \"sudo apt-" -"get dist-upgrade\"를 실행하여 시스템을 완전하게 업데이트 하십시오." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "다음 업데이트는 무시됩니다:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "버전 %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "바뀐 목록을 다운로드 하는 중..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "다운로드 크기: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "시스템이 최신의 상태입니다." -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다." -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "업데이트가 끝났습니다." -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "새 버전: %s (크기: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "버전 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "더 이상 지원되지 않는 배포판입니다." -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -987,17 +982,17 @@ msgstr "" "그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에" "서 보실 수 있습니다." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "새 배포판 '%s'를 이용할 수 있습니다" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "소프트웨어 목록이 망가졌습니다." -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1475,6 +1470,12 @@ msgstr "우분투 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "공식적으로 지원됨" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1517,8 +1518,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "공식적으로 지원됨" +msgid "No longer oficially supported" +msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1589,6 +1590,19 @@ msgstr "DFSG 호환이지만 자유소프트웨어가 아닌 의존성이 있는 msgid "Non-DFSG-compatible Software" msgstr "DFSG와 호환이 안되는 소프트웨어" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "어떤 업데이트는 설치하려면 다른 소프트웨어를 삭제해야 합니다. \"시냅틱\" " +#~ "꾸러미 관리자의 \"모든 업그레이드 하기\" 기능을 사용하거나 터미널에서 " +#~ "\"sudo apt-get dist-upgrade\"를 실행하여 시스템을 완전하게 업데이트 하십시" +#~ "오." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "다음 업데이트는 무시됩니다:" + #~ msgid "About %li seconds remaining" #~ msgstr "%li 초 정도 남았음" diff --git a/po/ku.po b/po/ku.po index 57869bc9..32eb3214 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -80,45 +80,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -126,38 +126,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Paketên şikestî" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -166,34 +166,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Nikarî '%s' saz bike" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -216,15 +216,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -232,11 +232,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -249,11 +249,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -262,42 +262,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -306,15 +306,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -323,21 +323,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -346,49 +346,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Jê bibe" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -398,19 +398,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Tê bilindkirin" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Bilindkirina sîstemê temam bû." @@ -471,11 +471,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -485,28 +485,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paket dê were rakirin." msgstr[1] "%s paket dê werin rakirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s paket dê were sazkirin" msgstr[1] "%s paket dê werin sazkirin" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paket dê were bilindkirin." msgstr[1] "%s paket dê werin bilindkirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -514,74 +514,74 @@ msgid "" "You have to download a total of %s. " msgstr "Pêwîst e tu bi tevahî %s daxî." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Sîstema xwe berê hat bilindkirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "%s rake" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "%s saz bike" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "%s bilind bike" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -797,125 +797,123 @@ msgstr "Ubuntu tê bilindkirin" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Guhertoya %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Mezinahiya daxistinê: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Sîstema te rojane ye" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Tu dikarî %s rojanekirinê saz bikî" msgstr[1] "Tu dikarî %s rojanekirinan saz bikî" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Rojanekirin temam bû" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Guhertoya nû: %s (Mezinahî: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Guhertoya %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1357,6 +1355,12 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Bi piştgirtiya fermî" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1397,7 +1401,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Bi piştgirtiya fermî" #. CompDescription diff --git a/po/lt.po b/po/lt.po index f30e5b26..f4691734 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" @@ -80,47 +80,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Programinės įrangos atnaujinimai" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importuoti raktą" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Importuojant pasirinktą failą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Pasirinktas failas gali būti sugadintas arba ne GPG rakto failas." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,19 +131,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Įveskite disko pavadinimą" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Įdėkite diską į įrenginį:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Sugadinti paketai" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -152,20 +152,20 @@ msgstr "" "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi „synaptic“ " "arba „apt-get“." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Negalima atnaujinti reikiamų metapaketų" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Turėtų būti pašalintas esminis paketas" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Nepavyko paskaičiuoti atnaujinimo" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -177,11 +177,11 @@ msgstr "" "tai kaip klaidą. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Klaida autentikuojant keletą paketų" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -190,12 +190,12 @@ msgstr "" "Nepavyko patvirtinti kelių paketų autentiškumo. Tai gali būti laikina tinklo " "problema. Galite bandyti vėliau. Žemiau yra nepatvirtintų paketų sąrašas." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -203,12 +203,12 @@ msgstr "" "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 #, fuzzy msgid "Can't guess meta-package" msgstr "Negalima nuspėti meta paketo" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -237,15 +237,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Nuskaitoma talpykla" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -253,12 +253,12 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 #, fuzzy msgid "No valid mirror found" msgstr "Nerasta tinkamo įrašo" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -271,11 +271,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Ar sukurti numatytųjų šaltinių sąrašą?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -284,11 +284,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Saugyklų informacija netinkama" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -296,11 +296,11 @@ msgstr "" "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. " "Praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Trečiųjų šalių šaltiniai išjungti" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -310,11 +310,11 @@ msgstr "" "Juos galėsite vėl įjungti, kai baigsite atnaujinimą su „programų savybių“ " "įrankiu arba „Synaptic“ paketų tvarkykle." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Klaida atnaujinant" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -322,11 +322,11 @@ msgstr "" "Atnaujinant iškilo problema. Tai greičiausiai kokia nors tinklo problema, " "todėl iš naujo patikrinkite tinklo jungtis ir bandykite dar." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Diske nepakanka laisvos vietos" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -335,15 +335,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "At norite pradėti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Nepavyko įdiegti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -355,11 +355,11 @@ msgstr "" "Atnaujinimas dabar bus nutrauktas. Jūsų sistema gali būti netinkama naudoti. " "Dabar bus vykdomas atkūrimas (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Nepavyko atsiųsti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -367,11 +367,11 @@ msgstr "" "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba įdiegimo " "laikmeną ir bandykite dar. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -385,23 +385,23 @@ msgstr "" "Jei nesate įjungę „universe“ skyriaus, šie paketai bus siūlomi pašalinimui " "kitame žingsnyje. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Pašalinti pasenusius paketus?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Praleisti šį žingsnį" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "P_ašalinti" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -410,26 +410,26 @@ msgstr "" "pranešime. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Perkraunama sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Tikrinama paketų valdyklė" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Atnaujinama saugyklų informacija" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Netinkama paketo informacija" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -442,19 +442,19 @@ msgstr "" "paketo „%s“.\n" "Tai labai rimta problema, praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Klausiama patvirtinimo" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Atnaujinama" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Ieškoma pasenusios programinės įrangos" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Sistemos atnaujinimas baigtas." @@ -517,11 +517,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Nerasta komanda „diff“" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Įvyko lemtinga klaida" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -537,7 +537,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -545,7 +545,7 @@ msgstr[0] "Bus pašalintas %s paketas." msgstr[1] "Bus pašalinti %s paketai." msgstr[2] "Bus pašalinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -553,7 +553,7 @@ msgstr[0] "Bus įdiegtas %s naujas paketas." msgstr[1] "Bus įdiegti %s nauji paketai." msgstr[2] "Bus įdiegta %s naujų paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -561,7 +561,7 @@ msgstr[0] "Bus atnaujintas %s paketas." msgstr[1] "Bus atnaujinti %s paketai." msgstr[2] "Bus atnaujinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -569,7 +569,7 @@ msgid "" "You have to download a total of %s. " msgstr "Turite atsisiųsti viso %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -577,70 +577,70 @@ msgid "" msgstr "" "Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Norint išvengti duomenų praradimo turite užverti visas atvertas programas ir " "dokumentus." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Nepavyko rasti jokių atnaujinimų" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Jūsų sistema jau buvo atnaujinta." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Pašalinti %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Įdiegti %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Atnaujinti %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Reikia perkrauti kompiuterį" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -879,77 +879,71 @@ msgstr "Atnaujinti iki naujausios Ubuntu versijos" msgid "Other updates" msgstr "Diegiami atnaujinimai" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Negalima įdiegti visų galimų atnaujinimų" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Kai kuriems atnaujinimams reikia pašalinti programinę įrangą. Naudokitės " -"funkcija „Žymėti visus atnaujinimus“ paketų tvarkyklėje „Synaptic­“ arba " -"terminale įvykdykite komandą „sudo apt-get dist-upgrade“, kad Jūsų sistema " -"būtų visiškai atnaujinta." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Šie atnaujinimai nebus įdiegti:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Atsiunčiamas pakeitimų sąrašas..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Atsiuntimo dydis: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Jūsų sistema atnaujinta" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -957,35 +951,35 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Palaukite, tai gali užtrukti." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Atnaujinimas užbaigtas" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nauja versija: %s (Dydis: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Jūsų distribucija daugiau nebepalaikoma" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -995,17 +989,17 @@ msgstr "" "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie " "atnaujinimą rasite http://www.ubuntu.com ." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Programinės įrangos turinys sugadintas" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1495,6 +1489,11 @@ msgstr "Ubuntu 5.10 „Breezy Badger“" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Prižiūrima oficialiai" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1536,8 +1535,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Prižiūrima oficialiai" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1608,6 +1608,19 @@ msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis msgid "Non-DFSG-compatible Software" msgstr "Su DFSG nesuderinama programinė įranga" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Kai kuriems atnaujinimams reikia pašalinti programinę įrangą. Naudokitės " +#~ "funkcija „Žymėti visus atnaujinimus“ paketų tvarkyklėje „Synaptic­“ arba " +#~ "terminale įvykdykite komandą „sudo apt-get dist-upgrade“, kad Jūsų " +#~ "sistema būtų visiškai atnaujinta." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Šie atnaujinimai nebus įdiegti:" + #~ msgid "Download is complete" #~ msgstr "Atsiųsta" diff --git a/po/mk.po b/po/mk.po index a54a4b2f..41a8e55c 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -81,51 +81,51 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Надградба на софтвер" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Изворен код" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Изворен код" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Грешка при увоз на избраната датотека" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Избраната датотека може да не е GPG датотека или пак може да е расипана." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -133,38 +133,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -176,23 +176,23 @@ msgstr "" "како бубачка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -202,11 +202,11 @@ msgstr "" "како бубачка. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -229,15 +229,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -245,11 +245,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -262,12 +262,12 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 #, fuzzy msgid "Generate default sources?" msgstr "Врати ги стандардните клучеви" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -276,43 +276,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "Грешка при отстранување на клучот" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -321,15 +321,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -338,21 +338,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -361,50 +361,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "Веќе работи друг менаџер за пакети" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -414,20 +414,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -488,11 +488,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -502,7 +502,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -510,7 +510,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -518,7 +518,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -526,7 +526,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -534,74 +534,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -829,7 +829,6 @@ msgstr "" msgid "Other updates" msgstr "Инсталирам надградби..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Cannot install all available updates" @@ -837,68 +836,67 @@ msgstr "Проверувам за надградби..." #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Верзија %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, fuzzy, python-format msgid "Download size: %s" msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "Вашиот систем е надграден!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -906,53 +904,53 @@ msgstr[0] "Инсталирам надградби..." msgstr[1] "Инсталирам надградби..." msgstr[2] "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Верзија %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуција повеќе не е поддржана" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1425,6 +1423,12 @@ msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Официјално поддржано" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1466,7 +1470,7 @@ msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Официјално поддржано" #. CompDescription diff --git a/po/ms.po b/po/ms.po index 0bf4b8b8..c11414eb 100644 --- a/po/ms.po +++ b/po/ms.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux \n" "Language-Team: Malay \n" @@ -80,48 +80,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Kekunci impot" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Ralat semasa mengimpot fail yang dipilih" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Fail yang dipilih mungkin bukan fail kekunci GPG atau fail mungkin rosak" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Ralat semasa mengeluarkan kekunci" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Kekunci yang anda pilih tidak dapat di keluarkan. Sila laporkan ini sebagai " "ralat pepijat." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -132,19 +132,19 @@ msgstr "" "↵\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Sila masukkan nama untuk cakera padat" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Sila masukkan cakera padat kedalam pemacu" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Pakej rosak" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -153,20 +153,20 @@ msgstr "" "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-get " "sebelum meneruskan." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Satu pakej yang perlu terpaksa dikeluarkan" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menjangka penaikkan taraf" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -178,23 +178,23 @@ msgstr "" "penaikkan. Sila laporkan ini sebagai ralat pepijat. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -203,11 +203,11 @@ msgstr "" "pepijat. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Pakej meta tidak dapat diduga." -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -235,15 +235,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -251,11 +251,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -268,11 +268,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -281,21 +281,21 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Sumber ketiga tidak diaktifkan." -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -306,11 +306,11 @@ msgstr "" "selepas penaikkan taraf menggunakan alatan 'software-properties' ataupun " "'synaptic'." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Ralat semasa pengemaskinian." -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -319,11 +319,11 @@ msgstr "" "yang berkaitan dengan masaalah rangkaian, sila periksa dan cuba lagi " "sambungan rangkaian anda." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Muatak cakera keras tidak mencukupi." -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -335,15 +335,15 @@ msgstr "" "pemasangan sebelum ini menggunakan 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Anda mahu mulakan penaikkan taraf?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf." -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -355,11 +355,11 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sistem anda mungkin tidak stabil. " "Sistem 'recovery' telah dijalankan (dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai." -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -367,11 +367,11 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sila semak sambungan 'internet' atau " "media pemasangan anda dan cuba lagi. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 #, fuzzy msgid "" "These installed packages are no longer officially supported, and are now " @@ -385,49 +385,49 @@ msgstr "" "Jika anda tidak megaktifkan 'universe', pakej-pakej ini akan dicadangkan " "untuk dikeluarkan di peringkat selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Keluarkan pakej-pakej yang sudah luput?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -437,19 +437,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -509,11 +509,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -523,28 +523,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -552,74 +552,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -835,125 +835,123 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1386,6 +1384,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1423,8 +1426,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." #. CompDescription #: ../data/channels/Ubuntu.info.in:257 diff --git a/po/nb.po b/po/nb.po index c01da700..fc7aedb4 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" @@ -80,49 +80,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Programvareoppdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importer nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Feil under importering av valgt fil" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Enten er valgt fil ikke en GPG-nøkkelfil, eller så er den kanskje skadet" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Kunne ikke fjerne nøkkelen" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nøkkelen du valgte kan ikke fjernes. Vennligst rapporter denne feilen." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -133,19 +133,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Vennligst oppgi et navn for platen" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Vennligst sett inn en plate i CD-spilleren:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Skadede pakker" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -154,20 +154,20 @@ msgstr "" "av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic eller " "apt-get før du fortsetter." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke oppgradere nødvendige meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "En nødvendig pakke må fjernes" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -179,11 +179,11 @@ msgstr "" "rapporter dette som en feil. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Kunne ikke autentisere noen pakker" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,12 +193,12 @@ msgstr "" "nettverksproblem, så du bør prøve igjen senere. Se under for listen over " "pakker som ikke kunne autentiseres." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -206,11 +206,11 @@ msgstr "" "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Kan ikke gjette på meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -239,15 +239,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Leser mellomlager" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -255,11 +255,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Fant ikke noe gyldig speil" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -279,11 +279,11 @@ msgstr "" "Hvis du velger \"Nei\" vil oppgraderingen avbrytes." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Vil du opprette standardkilder?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -297,11 +297,11 @@ msgstr "" "Skal standard linjer for '%s' legges til? Hvis du velger 'Nei' vil " "oppdateringen avbrytes." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Ugyldig informasjon om arkiv" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -309,11 +309,11 @@ msgstr "" "Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst " "rapporter dette som en feil." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Tredjepartskilder er deaktivert" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -323,11 +323,11 @@ msgstr "" "aktivere dem etter oppgraderingen ved hjelp av verktøyet 'Egenskaper for " "programvare' eller med Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Feil under oppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -336,11 +336,11 @@ msgstr "" "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din " "og prøv igjen." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Ikke nok ledig diskplass" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -352,15 +352,15 @@ msgstr "" "bruke 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Ønsker du å starte oppgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Kunne ikke installere oppgraderingene" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -372,11 +372,11 @@ msgstr "" "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. En reperasjon " "ble forsøkt kjørt (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Kunne ikke laste ned alle oppgraderingene." -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -384,11 +384,11 @@ msgstr "" "Oppgraderingen avbrytes nå. Vennligst sjekk internet-tilkoblingen eller " "installasjonsmediet og prøv på nytt. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Noe programvare er ikke lenger offisielt støttet" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -402,23 +402,23 @@ msgstr "" "Hvis du ikke har 'universe' aktivert vil disse pakkene bli foreslått fjernet " "i neste steg. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Ønsker du å fjerne utdaterte pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Hopp over dette punktet" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Feil ved commit" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -427,26 +427,26 @@ msgstr "" "informasjon. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Gjenoppretter systemets originale tilstand" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Sjekker pakkehåndterer" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Oppdaterer informasjon om arkivet" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Ugyldig pakkeinformasjon" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -459,19 +459,19 @@ msgstr "" "pakken '%s'.\n" "Dette indikerer en alvorlig feil, vennligst rapportér denne feilen." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Spør om bekreftelse" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Oppgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Søker etter utdatert programvare" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Systemoppgraderingen er fullført" @@ -534,11 +534,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Kommandoen 'diff' ble ikke funnet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "En uopprettelig feil oppsto" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -552,28 +552,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pakke vil bli fjernet." msgstr[1] "%s pakker vil bli fjernet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s pakke vil bli installert." msgstr[1] "%s pakker vil bli installert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pakke vil bli oppgradert." msgstr[1] "%s pakker vil bli oppgradert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -581,7 +581,7 @@ msgid "" "You have to download a total of %s. " msgstr "Du må laste ned totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -590,69 +590,69 @@ msgstr "" "Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere " "tidspunkt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 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." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Kunne ikke finne noen oppgraderinger" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Systemet ditt er allerede oppgradert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Fjern %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Installér %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Oppgradér %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Rundt %li dager, %li timer og %li minutter gjenstår" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Rundt %li timer og %li minutter gjenstår" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Omstart er nødvendig" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -893,112 +893,106 @@ msgstr "Oppgrader til siste versjon av Ubuntu" msgid "Other updates" msgstr "Installerer oppdateringer" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Kan ikke installere alle tilgjengelige oppdateringer." #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Noen oppdateringer krever fjerning av andre programpakker. Bruk funksjonen " -"\"Merk alle oppgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller " -"kjør kommandoen \"sudo apt-get dist-upgrade\" i en terminal for å oppgradere " -"systemet fullstendig." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Følgende pakker vil ikke bli oppgradert:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Laster ned listen med endringer..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Nedlastingsstørrelse: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Systemet ditt er oppdatert!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installere %s oppdatering" msgstr[1] "Du kan installere %s oppdateringer" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Vennligst vent, dette kan ta litt tid." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Oppdateringen er fullført" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny versjon: %s (Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1008,17 +1002,17 @@ msgstr "" "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www." "ubuntu.com for mer informasjon om oppgradering." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Ny versjon \"%s\" er tilgjengelig" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Programvareoversikten er ødelagt." -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1507,6 +1501,11 @@ msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Offisielt støttet" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1549,8 +1548,9 @@ msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Offisielt støttet" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Noe programvare er ikke lenger offisielt støttet" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1619,6 +1619,19 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter" msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel programvare" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Noen oppdateringer krever fjerning av andre programpakker. Bruk " +#~ "funksjonen \"Merk alle oppgraderinger\" i pakkehåndteringsprogrammet " +#~ "\"Synaptic\" eller kjør kommandoen \"sudo apt-get dist-upgrade\" i en " +#~ "terminal for å oppgradere systemet fullstendig." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Følgende pakker vil ikke bli oppgradert:" + #~ msgid "About %li seconds remaining" #~ msgstr "Rundt %li sekunder gjenstår" diff --git a/po/ne.po b/po/ne.po index 7a7e0a00..c521494d 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -82,48 +82,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "सफ्टवेयर अद्यावधिकहरु" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "स्रोत" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "स्रोत" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,38 +131,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -172,23 +172,23 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -196,11 +196,11 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -223,15 +223,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -239,11 +239,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -256,11 +256,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -269,43 +269,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -314,15 +314,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,21 +331,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -354,50 +354,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,20 +407,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "स्तरवृद्धि समाप्त" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -481,11 +481,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -495,28 +495,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -524,75 +524,75 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 #, fuzzy msgid "Your system has already been upgraded." msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -816,129 +816,126 @@ msgstr "" msgid "Other updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:277 -#, fuzzy -msgid "The following updates will be skipped:" -msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "संस्करण %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, fuzzy, python-format msgid "Download size: %s" msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै" msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "संस्करण %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "तपाईंको वितरण समर्थित छैन" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1413,6 +1410,12 @@ msgstr "युबन्टु ५.०४ सुरक्षा अद्या msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "कार्यालय बाट समर्थित" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1455,7 +1458,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "कार्यालय बाट समर्थित" #. CompDescription @@ -1528,6 +1531,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "The following updates will be skipped:" +#~ msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन" + #, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" diff --git a/po/nl.po b/po/nl.po index e09ecc84..0039dc95 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" @@ -79,50 +79,50 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Software-updates" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Sleutel importeren" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Fout bij het importeren van het geselecteerde bestand." -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Het geselecteerde bestand is misschien geen GPG-sleutel, of het kan " "beschadigd zijn." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Fout bij het verwijderen van de sleutel" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "De door u geselecteerde sleutel kon niet verwijderd worden. Gelieve dit als " "fout te melden." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -133,19 +133,19 @@ msgstr "" "↵\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Geef het cd-schijfje een naam" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Plaats een schijf in de speler:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Niet-werkende pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -154,20 +154,20 @@ msgstr "" "met deze software. Repareer deze eerst met synaptic of apt-get voordat u " "verder gaat." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Kan de vereiste meta-pakketten niet upgraden." -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Een essentieel pakket zou verwijderd worden" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Kan de vereisten voor de upgrade niet berekenen" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -179,11 +179,11 @@ msgstr "" "Gelieve dit als fout te rapporteren. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Fout bij het bepalen van de echtheid van sommige pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -194,12 +194,12 @@ msgstr "" "proberen. Hieronder vindt u een lijst met pakketten waarvan de echtheid niet " "vastgesteld is." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Kan '%s' niet installeren" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -208,11 +208,11 @@ msgstr "" "fout te rapporteren. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Kan het meta-pakket niet raden" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -242,15 +242,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Tijdelijke opslag inlezen" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -258,11 +258,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Geen geldige mirror-server gevonden" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -283,11 +283,11 @@ msgstr "" "Wanneer u 'Nee' kiest, zal de update worden geannuleerd." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "De standaard bronnenlijst genereren?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -301,11 +301,11 @@ msgstr "" "Moeten de standaardregels voor '%s' worden toegevoegd? Wanneer u 'Nee' " "kiest, zal de update worden geannuleerd." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "De informatie over de pakketbronnen is ongeldig" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -313,11 +313,11 @@ msgstr "" "Het upgraden van de informatie over de pakketbronnen heeft het bestand " "ongeldig gemaakt. Rapporteer dit als een fout." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Pakketbronnen van derden uitgeschakeld" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -327,11 +327,11 @@ msgstr "" "kunt ze na de upgrade weer inschakelen via het menu Systeem -> Beheer -> " "Software-eigenschappen of met het programma Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Fout tijdens het updaten" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -339,11 +339,11 @@ msgstr "" "Tijdens het updaten is er iets misgegaan. Dit komt meestal door " "netwerkproblemen. Controleer uw netwerkverbinding en probeer opnieuw." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Niet genoeg vrije schijfruimte" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -355,15 +355,15 @@ msgstr "" "vorige installaties via 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Wilt u beginnen met de upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Kon de upgrades niet installeren" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -376,11 +376,11 @@ msgstr "" "onbruikbare toestand. Er is een hersteloperatie uitgevoerd (dpkg --configure " "-a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Kon de upgrades niet downloaden" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -388,11 +388,11 @@ msgstr "" "De upgrade wordt nu afgebroken. Controleer uw internetverbinding of het " "installatiemedium en probeer opnieuw. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Bepaalde software wordt niet meer officieel ondersteund" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -406,23 +406,23 @@ msgstr "" "Indien 'universe' niet geactiveerd is zal bij de volgende stap gevraagd " "worden om deze pakketten te verwijderen. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Overbodige pakketten verwijderen?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Deze stap overslaan" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Verwijderen" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Fout bij het toepassen" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -431,26 +431,26 @@ msgstr "" "voor meer informatie. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "De oorspronkelijke toestand wordt hersteld" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Pakkettenbeheer controleren" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Updaten van de informatie over de pakketbronnen" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Ongeldige pakketinformatie" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -463,19 +463,19 @@ msgstr "" "meer gevonden worden.\n" "Dit is een ernstige fout, die gerapporteerd moet worden." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Vragen om bevestiging" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Bezig met upgraden" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Zoeken naar overbodige software" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Systeemupgrade is voltooid." @@ -538,11 +538,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "De opdracht 'diff' is niet gevonden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Er is een ernstige fout ontstaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -558,28 +558,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Er zal %s pakket verwijderd worden." msgstr[1] "Er zullen %s pakketten verwijderd worden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Er zal %s nieuw pakket geïnstalleerd worden." msgstr[1] "Er zullen %s nieuwe pakketten geïnstalleerd worden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pakket zal een upgrade krijgen" msgstr[1] "%s pakketten zullen een upgrade krijgen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -587,7 +587,7 @@ msgid "" "You have to download a total of %s. " msgstr "U moet in totaal %s downloaden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -596,70 +596,70 @@ msgstr "" "Het upgraden kan enkele uren in beslag nemen en kan tussentijds niet worden " "afgebroken." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Sluit alle openstaande toepassingen en documenten om dataverlies te " "voorkomen." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Kon geen upgrades vinden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Uw systeem heeft al een upgrade gekregen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "%s verwijderen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "%s installeren" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "%s upgraden" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Ongeveer %li dagen %li uur en %li minuten resterend" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Ongeveer %li uur en %li minuten resterend" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "De computer moet opnieuw opgestart worden" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -902,112 +902,106 @@ msgstr "Upgrade naar de nieuwste versie van Ubuntu" msgid "Other updates" msgstr "Up_dates installeren" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Kan de beschikbare updates niet installeren" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Enkele updates vereisen dat andere softwarepaketten verwijderd worden. " -"Gebruik de functie \"Pakketten bijwerken\" van het pakkettenbeheerprogramma " -"\"Synaptic\" of gebruik: \"sudo apt-get dist-upgrade\" in een " -"terminalvenster om uw systeem compleet bij te werken met de laatste updates." -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "De volgende updates worden overgeslagen:" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versie %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Het overzicht van de wijzigingen wordt gedownload..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Downloadgrootte: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Uw systeem is up-to-date" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "U kunt %s update installeren" msgstr[1] "U kunt %s updates installeren" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Een ogenblik geduld, dit kan even duren." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "De update is voltooid" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nieuwe versie: %s (Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versie %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Uw distributie wordt niet langer ondersteund" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1017,17 +1011,17 @@ msgstr "" "upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu." "com voor meer informatie over upgraden." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Software-index is beschadigd" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1513,6 +1507,12 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Officieel ondersteund" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1555,8 +1555,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "Officieel ondersteund" +msgid "No longer oficially supported" +msgstr "Bepaalde software wordt niet meer officieel ondersteund" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1627,6 +1627,20 @@ msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden" msgid "Non-DFSG-compatible Software" msgstr "Software niet compatibel met DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Enkele updates vereisen dat andere softwarepaketten verwijderd worden. " +#~ "Gebruik de functie \"Pakketten bijwerken\" van het " +#~ "pakkettenbeheerprogramma \"Synaptic\" of gebruik: \"sudo apt-get dist-" +#~ "upgrade\" in een terminalvenster om uw systeem compleet bij te werken met " +#~ "de laatste updates." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "De volgende updates worden overgeslagen:" + #~ msgid "About %li seconds remaining" #~ msgstr "Ongeveer %li seconden resterend" diff --git a/po/no.po b/po/no.po index f4e86250..ce95de07 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -81,49 +81,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Programvareoppdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,38 +131,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -173,23 +173,23 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -198,11 +198,11 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -241,11 +241,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -258,11 +258,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,43 +271,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "Feil under fjerning av nøkkel" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -316,15 +316,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -333,21 +333,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -356,50 +356,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -409,21 +409,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -484,11 +484,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -498,28 +498,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -527,75 +527,75 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 #, fuzzy msgid "Your system has already been upgraded." msgstr "Systemet har ødelagte pakker!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, fuzzy, python-format msgid "Remove %s" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, fuzzy, python-format msgid "Install %s" msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -821,129 +821,126 @@ msgstr "" msgid "Other updates" msgstr "Installerer oppdateringer..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:277 -#, fuzzy -msgid "The following updates will be skipped:" -msgstr "De følgende pakkene er ikke oppgradert:" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, fuzzy, python-format msgid "Download size: %s" msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "Systemet er helt oppdatert!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installerer oppdateringer..." msgstr[1] "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1416,6 +1413,12 @@ msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Offisielt støttet" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1459,7 +1462,7 @@ msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Offisielt støttet" #. CompDescription @@ -1532,6 +1535,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "The following updates will be skipped:" +#~ msgstr "De følgende pakkene er ikke oppgradert:" + #, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" diff --git a/po/oc.po b/po/oc.po index cd4a7bac..2a369d2a 100644 --- a/po/oc.po +++ b/po/oc.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" @@ -81,48 +81,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importar clau" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Error al moment d'importar lo fichièr seleccionat" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Lo fichièr seleccionat es benlèj pas una clau GPG o es possible que siá " "corrumput." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Error al moment de suprimir la clau" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Avem pas poscut suprimir la clau qu'avètz seleccionada. Raportatz l'anomalia." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -133,38 +133,38 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Picatz un nom pel disc" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Metètz un disc dins lo legidor :" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Paquetatges corromputs" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Impossible calcular la mesa a jorn" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -173,34 +173,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Impossible installar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -223,15 +223,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -239,11 +239,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -256,11 +256,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -269,42 +269,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Error al moment de metre a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Pas pro d'espaci liure" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -313,15 +313,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Volètz començar la mesa a jorn ?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Impossible installar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -330,21 +330,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Impossible descargar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -353,49 +353,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Suprimir" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -405,19 +405,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Mesa a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "La mesa a jorn del sistèma es acabada." @@ -477,11 +477,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -491,28 +491,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -520,74 +520,74 @@ msgid "" "You have to download a total of %s. " msgstr "Debètz telecargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Suprimir %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Installar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Metre a jorn %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -805,125 +805,123 @@ msgstr "Metre a jorn Ubuntu" msgid "Other updates" msgstr "Mesas a jorn per internet" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Talha de la descarga : %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Podètz installar %s mesa a jorn" msgstr[1] "Podètz installar %s mesas a jorn" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1369,6 +1367,11 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1409,7 +1412,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/pa.po b/po/pa.po index 6f74b26b..396fec53 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -81,46 +81,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -128,38 +128,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -168,34 +168,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -218,15 +218,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -234,11 +234,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -251,11 +251,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -264,42 +264,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -308,15 +308,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -325,21 +325,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -348,49 +348,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -400,20 +400,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -473,11 +473,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -487,28 +487,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -516,74 +516,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -804,125 +804,123 @@ msgstr "" msgid "Other updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1371,6 +1369,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1408,7 +1411,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/pl.po b/po/pl.po index a58b4d95..a54f3a7a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Polish \n" @@ -80,48 +80,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Aktualizacje oprogramowania" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Źródłowy" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Źródłowy" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Zaimportuj klucz" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Błąd podczas importowania wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -132,19 +132,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Proszę podać nazwę dla płyty" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Proszę włożyć płytę do napędu:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Uszkodzone pakiety" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -153,20 +153,20 @@ msgstr "" "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub " "apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Nie można zaktualizować wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Niezbędny pakiet musiałby zostać usunięty" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -178,11 +178,11 @@ msgstr "" "zgłosić to jako błąd. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Błąd podczas uwierzytelniania niektórych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,23 +192,23 @@ msgstr "" "sieci. Można spróbować ponownie później. Poniżej znajduje się lista " "nieuwierzytelnionych pakietów." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Nie można zainstalować \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -235,15 +235,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Odczytywanie bufora podręcznego" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -251,11 +251,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Nie odnaleziono poprawnego serwera lustrzanego" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -275,11 +275,11 @@ msgstr "" "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Wygenerować domyślne źródła?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -293,11 +293,11 @@ msgstr "" "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" " "aktualizacja zostanie anulowana." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Błędne informacje o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -305,11 +305,11 @@ msgstr "" "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę " "zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Źródła stron niezależnych zostały wyłączone" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -319,11 +319,11 @@ msgstr "" "włączyć po aktualizacji używając narzędzia \"Właściwości oprogramowania\" " "lub za pomocą Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Błąd podczas aktualizacji" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -331,11 +331,11 @@ msgstr "" "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z " "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Zbyt mało miejsca na dysku" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -347,15 +347,15 @@ msgstr "" "\"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Czy chcesz rozpocząć aktualizację?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem." -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -368,11 +368,11 @@ msgstr "" "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Pobranie aktualizacji było niemożliwe" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -380,11 +380,11 @@ msgstr "" "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz " "dysk instalacyjny i spróbować ponownie. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Niektóre programy nie są już oficjalnie wspierane" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -398,23 +398,23 @@ msgstr "" "Jeśli nie masz włączonego \"universe\" w następnym kroku zostanie " "zasugerowane ich usunięcie. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Usunąć niepotrzebne pakiety?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Pomiń ten krok" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Usuń" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Błąd podczas zatwierdzania" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -423,26 +423,26 @@ msgstr "" "poniższych wiadomościach. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Przywracanie pierwotnego stanu systemu" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Sprawdzanie menedżera pakietów" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Aktualizowanie informacji o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Błędne informacje o pakietach" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -455,19 +455,19 @@ msgstr "" "być odnaleziony.\n" "To wskazuje na poważny problem, proszę zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Pytanie o potwierdzenie" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Aktualizacja w toku" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Aktualizacja systemu zakończona powodzeniem." @@ -530,11 +530,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Polecenie \"diff\" nie zostało odnalezione" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Wystąpił błąd krytyczny" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -549,7 +549,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -557,7 +557,7 @@ msgstr[0] "%s pakiet zostanie usunięty." msgstr[1] "%s pakiety zostaną usunięte." msgstr[2] "%s pakietów zostanie usuniętych." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -565,7 +565,7 @@ msgstr[0] "%s nowy pakiet zostanie zainstalowany." msgstr[1] "%s nowe pakiety zostaną zainstalowane." msgstr[2] "%s nowy pakietów zostanie zainstalowane." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -573,7 +573,7 @@ msgstr[0] "%s pakiet zostanie zaktualizowany." msgstr[1] "%s pakiety zostaną zaktualizowane." msgstr[2] "%s pakietów zostanie zaktualizowanych." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -581,7 +581,7 @@ msgid "" "You have to download a total of %s. " msgstr "Konieczne pobranie ogółem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -589,70 +589,70 @@ msgid "" msgstr "" "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i " "dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Nie odnaleziono żadnych aktualizacji" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "System został już zaktualizowany." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Usuń %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Instaluj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Aktualizuj %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Około %li dni %li godzin %li minut pozostało" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Około %li godzin %li minut pozostało" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Wymagane ponowne uruchomienie komputera" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -891,77 +891,71 @@ msgstr "Zaktualizuj do najnowszej wersji Ubuntu" msgid "Other updates" msgstr "Instalowanie pakietów" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Niektóre aktualizacje wymagają dalszego usuwania oprogramowania. Aby " -"ukończyć proces aktualizacji użyj opcji \"Zaznacz wszystko do aktualizacji\" " -"w Mendżerze Pakietów Synaptic albo uruchom \"sudo apt-get dist-upgrade\" w " -"terminalu." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Następujące pakiety zostaną pominięte:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Wersja %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Pobieranie informacji o zmianach..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Rozmiar do pobrania: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Twój system jest w pełni zaktualizowany" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -969,35 +963,35 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s" msgstr[1] "Ilość dostępnych aktualizacji: %s" msgstr[2] "Ilość dostępnych aktualizacji: %s" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Proszę czekać, to może chwilę potrwać." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Aktualizacja została ukończona." -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nowa wersja: %s (Rozmiar: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Wersja %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Twoja dystrybucja nie jest już wspierana" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1007,17 +1001,17 @@ msgstr "" "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. " "Odwiedź http://www.ubuntu.com po więcej informacji." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Spis oprogramowania jest uszkodzony" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1506,6 +1500,11 @@ msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Wspierane oficjalnie" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1547,8 +1546,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Wspierane oficjalnie" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Niektóre programy nie są już oficjalnie wspierane" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1618,6 +1618,19 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free" msgid "Non-DFSG-compatible Software" msgstr "Oprogramowanie niekompatybilne z DFSG." +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Niektóre aktualizacje wymagają dalszego usuwania oprogramowania. Aby " +#~ "ukończyć proces aktualizacji użyj opcji \"Zaznacz wszystko do aktualizacji" +#~ "\" w Mendżerze Pakietów Synaptic albo uruchom \"sudo apt-get dist-upgrade" +#~ "\" w terminalu." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Następujące pakiety zostaną pominięte:" + #~ msgid "About %li seconds remaining" #~ msgstr "Około %li sekund pozostało" diff --git a/po/pt.po b/po/pt.po index a00e4343..1ed06dff 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho \n" "Language-Team: Ubuntu Portuguese Team \n" @@ -78,49 +78,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Actualizações de Software" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importar chave" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Erro ao importar ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O ficheiro seleccionado pode não ser um ficheiro de chave GPG ou pode estar " "corrompido." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Erro ao remover a chave" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "A chave que seleccionou não pôde ser removida. Por favor reporte este erro." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -131,19 +131,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Por favor introduza um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Pacotes Quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -152,20 +152,20 @@ msgstr "" "este software. Por favor corrija-os usando o synaptic ou apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível actualizar os meta-pacotes necessários" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Um pacote essencial teria que ser removido" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Impossível de calcular a actualização" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -177,11 +177,11 @@ msgstr "" "reporte este erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -191,12 +191,12 @@ msgstr "" "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma " "lista de pacotes não autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Impossível de instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -204,11 +204,11 @@ msgstr "" "Foi impossível instalar um pacote essencial. Por favor reporte este erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Impossível de descobrir meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -237,15 +237,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "A ler a cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -253,11 +253,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrada" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -278,11 +278,11 @@ msgstr "" "Se escolher \"não\" a actualização irá ser cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Gerar as fontes padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -296,11 +296,11 @@ msgstr "" "Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a " "actualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -308,11 +308,11 @@ msgstr "" "A actualização da informação de repositório resultou num ficheiro inválido. " "Por favor reporte este erro." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Fontes de terceiros desactivadas" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -322,11 +322,11 @@ msgstr "" "reactivá-las depois da actualização com a ferramenta 'propriedades-software' " "ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Erro durante a actualização" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -335,11 +335,11 @@ msgstr "" "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a " "tentar." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Não existe espaço livre em disco suficiente" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -351,15 +351,15 @@ msgstr "" "usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Deseja iniciar a actualização?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Impossível de instalar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -371,11 +371,11 @@ msgstr "" "A actualização abortará agora. O seu sistema poderá estar num estado " "inutilizável. Foi efectuada uma recuperação (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Impossível de descarregar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -383,11 +383,11 @@ msgstr "" "A actualização abortará agora. Por favor verifique a sua ligação à internet " "ou media de instalação e volte a tentar. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Algum software já não é suportado oficialmente" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -401,23 +401,23 @@ msgstr "" "Se não tem o repositório 'universe' activo será sugerida a remoção destes " "pacotes no próximo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Saltar Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Erro ao submeter" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -426,27 +426,27 @@ msgstr "" "abaixo para mais informação. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 #, fuzzy msgid "Restoring original system state" msgstr "A restaurar o estado original do sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "A verificar gestor de pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "A Actualizar informação de repositórios" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Informação de pacotes inválida" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -459,19 +459,19 @@ msgstr "" "pacote essencial '%s'.\n" "Isto indica um erro sério, por favor reporte este problema." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "A pedir confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "A actualizar" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "À procura de software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "A actualização do sistema está completa." @@ -534,11 +534,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -553,28 +553,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pacote será actualizado." msgstr[1] "%s pacotes serão actualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -582,7 +582,7 @@ msgid "" "You have to download a total of %s. " msgstr "Tem de efectuar o download de um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -591,70 +591,70 @@ msgstr "" "A actualização poderá demorar várias horas e não poderá ser cancelada a " "qualquer instante posteriormente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 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." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Impossível de encontrar quaisquer actualizações" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "O seu sistema já foi actualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Remover %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Cerca de %li dias %li horas %li minutos restantes" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Cerca de %li horas %li minutos restantes" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Necessário reiniciar" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -894,111 +894,106 @@ msgstr "Actualize para a última versão do Ubuntu" msgid "Other updates" msgstr "A instalar actualizações" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Impossível de instalar todas as actualizações disponíveis" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Algumas actualizações requerem a remoção de software. Utilize a função " -"\"Marcar Todas as Actualizações\" ou execute \"sudo apt-get dist-upgrade\" " -"numa consola para actualizar completamente o seu sistema." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "As seguintes actualizações serão ignoradas:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versão %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "A descarregar lista de alterações..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Pode instalar %s actualização" msgstr[1] "Pode instalar %s actualizações" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Por favor aguarde, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "A actualização está completa" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nova versão: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versão %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "A sua distribuição já não é suportada" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1008,17 +1003,17 @@ msgstr "" "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais " "informação em como actualizar." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "O índice de software está quebrado" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1506,6 +1501,11 @@ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Suportado Oficialmente" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1547,8 +1547,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Suportado Oficialmente" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Algum software já não é suportado oficialmente" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1619,6 +1620,18 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres" msgid "Non-DFSG-compatible Software" msgstr "Software compatível-DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Algumas actualizações requerem a remoção de software. Utilize a função " +#~ "\"Marcar Todas as Actualizações\" ou execute \"sudo apt-get dist-upgrade" +#~ "\" numa consola para actualizar completamente o seu sistema." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "As seguintes actualizações serão ignoradas:" + #~ msgid "About %li seconds remaining" #~ msgstr "Cerca de %li segundos restantes" diff --git a/po/pt_BR.po b/po/pt_BR.po index 704008d1..5a47815c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut \n" "Language-Team: Ubuntu-BR \n" @@ -79,52 +79,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Modificando os canais de programas" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importar Chave" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Erro importando o arquivo selecionado" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O arquivo selecionado pode não ser um arquivo de chave GPG ou pode estar " "corrompido." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Erro removendo a chave" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "A chave que você selecionou não pôde se removida. Por favor reporte isto " "como um erro." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -135,19 +135,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Por favor digite um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Pacotes quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -156,20 +156,20 @@ msgstr "" "programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes " "de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível atualizar os meta-pacotes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Um pacote essencial teria que ser removido" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -181,11 +181,11 @@ msgstr "" "favor reporte isto como um erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -195,12 +195,12 @@ msgstr "" "de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes " "não-autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -209,11 +209,11 @@ msgstr "" "um erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Não foi possível adivinhar o meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -242,15 +242,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Lendo cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -258,11 +258,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrado" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -282,11 +282,11 @@ msgstr "" "Se você selecionar 'não' a atualização será cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Gerar sources padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -300,11 +300,11 @@ msgstr "" "Entradas padrões para '%s' devem ser adicionadas? Se você escolher 'Não' a " "atualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -312,11 +312,11 @@ msgstr "" "Atualizando a informações de repositórios resultou em um arquivo inválido. " "Por favor reporte isso como um erro." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Fontes de terceiros desabilitadas" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -326,11 +326,11 @@ msgstr "" "poderá reabilitá-las depois de atualizar com a ferramenta 'propriedades do " "programa' ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Erro durante a atualização" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -339,11 +339,11 @@ msgstr "" "problemas de rede, por favor verifique a sua conexão de rede e tente " "novamente." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Não há espaço suficiente no disco" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -355,15 +355,15 @@ msgstr "" "instalações anteriores usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Você quer iniciar a atualização?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Não foi possível instalar as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -375,11 +375,11 @@ msgstr "" "A atualização será abortada agora. Seu sistema pode estar em um estado " "instável. Uma recuperação é executada (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Não foi possível obter as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -387,11 +387,11 @@ msgstr "" "A atualização será abortada agora. Por favor verifique sua conexão à " "Internet ou mídia de instalação e tente de novo. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Alguns softwares não são mais oficialmente suportado." -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -405,23 +405,23 @@ msgstr "" "Se você não tem o repositório 'universe' habilitado, estes pacotes serão " "sugeridos à remoção no próximo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Pular Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Erro ao aplicar as mudanças" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -430,27 +430,27 @@ msgstr "" "abaixo para maiores informações. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Reiniciando o estado original do sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Verificando o Gerenciador de Pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 #, fuzzy msgid "Invalid package information" msgstr "Informação do pacote inválida" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -463,19 +463,19 @@ msgstr "" "não pôde mais ser encontrado.\n" "Isto indica um sério erro, por favor reporte isso como um erro." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Pedindi por confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Atualizando" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "A Atualização do Sistema está completa." @@ -538,11 +538,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -557,28 +557,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pacote será atualizado." msgstr[1] "%s pacotes serão atualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -586,7 +586,7 @@ msgid "" "You have to download a total of %s. " msgstr "Você precisa obter um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -594,68 +594,68 @@ msgid "" msgstr "" "A atualização pode levar diversas horas e não poderá ser cancelada depois." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "Para evitar perda de dados, feche todas as aplicações e documentos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Não foi possível encontrar nenhuma atualização" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Seu sistema já foi atualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Remover %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Atualizar %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Aproximadamente %li dias %li horas %li minutos restando" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Aproximadamente %li horas %li minutos restando" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Reinicialização requerida" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -899,112 +899,106 @@ msgstr "Atualizar para a última versão do Ubuntu" msgid "Other updates" msgstr "Instalando Atualizações" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Não foi possível instalar todas as atualizações disponíveis" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Algumas atualizações requerem a remoção de outros pacotes.Use a função " -"\"Marcar Todas Atualizações\" do gerenciador de pacotes \"Synaptic\" ou rode " -"\"sudo apt-get dist-upgrade\" em um terminal para atualizar seu sistema " -"completamente." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "As seguintes atualizações serão puladas:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Obtendo a lista de alterações" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Seu sistema está atualizado" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Você pode instalar %s atualização" msgstr[1] "Você pode instalar %s atualizações" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Por favor, espere, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Atualização completa" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "New version: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Sua distribuição não é mais suportada" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1014,17 +1008,17 @@ msgstr "" "falhas de segurança. Atualize para uma versão mais nova do Ubuntu Linux. " "Veja http://www.ubuntu-br.org" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "A índex de software está quebrado" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1516,6 +1510,11 @@ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Suportado Oficialmente" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1557,8 +1556,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Suportado Oficialmente" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Alguns softwares não são mais oficialmente suportado." #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1628,6 +1628,19 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres" msgid "Non-DFSG-compatible Software" msgstr "Programas não compatíveis com a DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Algumas atualizações requerem a remoção de outros pacotes.Use a função " +#~ "\"Marcar Todas Atualizações\" do gerenciador de pacotes \"Synaptic\" ou " +#~ "rode \"sudo apt-get dist-upgrade\" em um terminal para atualizar seu " +#~ "sistema completamente." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "As seguintes atualizações serão puladas:" + #~ msgid "About %li seconds remaining" #~ msgstr "Aproximadamente %li segundos restando" diff --git a/po/ro.po b/po/ro.po index acf4aab7..df181e9a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" @@ -80,53 +80,53 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Actualizări software" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "" "Binar\n" "Sursă" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "" "Binar\n" "Sursă" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 #, fuzzy msgid "Import key" msgstr "Importă cheie" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Eroare la importarea fişierului selectat" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Fişierul selectat nu pare a fi o cheie GPG sau poate fi corupt." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Eroare la ştergerea cheii." -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Cheia selectată nu poate fi ştearsă. Raportaţi această eroare." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -137,20 +137,20 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Introduceţi un nume pentru disc" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Introduceţi un disc în unitate:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 #, fuzzy msgid "Broken packages" msgstr "Pachete deteriorate" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 #, fuzzy msgid "" "Your system contains broken packages that couldn't be fixed with this " @@ -160,20 +160,20 @@ msgstr "" "program. Înainte de a continua vă rugăm să le remediaţi utilizând synaptic " "sau apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -182,24 +182,24 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 #, fuzzy msgid "Error authenticating some packages" msgstr "Eroare la autentificarea unor pachete." -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Nu pot instala '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -209,11 +209,11 @@ msgstr "" "(eroare). " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -237,15 +237,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Citire cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -253,11 +253,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -270,11 +270,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -283,42 +283,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Eroare în timpul actualizării" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Spaţiu liber insuficient" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -327,15 +327,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Vrei sa începi upgrade-ul?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Nu s-au putut instalat upgrade-urile" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -344,21 +344,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Nu pot descărca actualizările" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -367,50 +367,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "Şter_ge" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 #, fuzzy msgid "Restoring original system state" msgstr "Se reface starea iniţială a sistemului" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Se verifică managerul de pachete" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -420,19 +420,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Se actualizează" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Actualizarea sistemului este completă" @@ -492,11 +492,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -506,7 +506,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -514,7 +514,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -522,7 +522,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -530,7 +530,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -538,74 +538,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Nu s-au găsit actualizări" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Sistemul dumneavoastră este actualizat la zi!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -830,74 +830,72 @@ msgstr "Se actualizează Ubuntu" msgid "Other updates" msgstr "_Instalează actualizarile" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Versiunea %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Se descarcă listă schimbărilor..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Sistemul dumneavoastră este actualizat la zi!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -905,53 +903,53 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versiunea nouă: %s (Mărime: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versiunea %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Distribuţia dvs. nu mai este suportată" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1424,6 +1422,12 @@ msgstr "Actualizări de securitate Ubuntu 5.04" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizări de securitate Ubuntu 5.04" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Pachete suportate oficial" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1466,7 +1470,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Pachete suportate oficial" #. CompDescription diff --git a/po/ru.po b/po/ru.po index ed3b0bb7..aa147236 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -81,47 +81,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Обновления программ" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Импортировать ключ" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Ошибка при импортировании выбранного файла" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Возможно выбранный файл не является файлом ключа GPG или поврежден." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Ошибка при удалении ключа" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -132,19 +132,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Введите название для диска" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Пожалуйста, вставьте диск в привод:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Поврежденные пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -153,20 +153,20 @@ msgstr "" "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-get, " "прежде чем продолжить." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Невозможно обновить требуемые мета-пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Будет удален необходимый пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Невозможно подготовить обновление системы" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -178,11 +178,11 @@ msgstr "" "Пожалуйста, отправьте отчет об ошибке. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Ошибка при проверке подлинности некоторых пакетов" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,12 +192,12 @@ msgstr "" "кратковременная проблема с сетью и стоит попробовать позже. Ниже приведен " "список пакетов, не прошедших проверку." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Невозможно установить '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -206,11 +206,11 @@ msgstr "" "ошибке. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Невозможно подобрать мета-пакет" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -238,15 +238,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Чтение кэша" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -254,11 +254,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Не найдено действующее зеркало" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -278,11 +278,11 @@ msgstr "" "Ответ 'Нет' отменит обновление." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Сгенерировать источники по умолчанию?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,11 +295,11 @@ msgstr "" "\n" "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Информация о репозитории неверна" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -307,11 +307,11 @@ msgstr "" "В результате обновления информации о репозиториях образовался неверный файл. " "Пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Источники третьих сторон отключены" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -321,11 +321,11 @@ msgstr "" "обновления вы можете снова включить их с помощью утилиты 'software-" "properties' или synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Ошибка при обновлении" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -333,11 +333,11 @@ msgstr "" "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в " "сети, проверьте сетевые подключения и повторите попытку." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Недостаточно свободного места на диске" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -349,15 +349,15 @@ msgstr "" "предыдущих установок с помощью команды 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Вы хотите начать обновление системы?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Невозможно установить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -369,11 +369,11 @@ msgstr "" "Обновление прервано. Система, возможно, находится в неработоспособном " "состоянии. Запущено восстановление системы (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Невозможно загрузить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -381,11 +381,11 @@ msgstr "" "Обновление прервано. Проверьте соединение с Интернет или установочный диск и " "попробуйте снова. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Некоторые программы больше не поддерживаются официально" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -399,23 +399,23 @@ msgstr "" "Если у вас не подключен репозиторий 'universe', на следующем шаге вам " "предложат удалить эти пакеты. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Удалить устаревшие пакеты?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Пропустить этот шаг" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Удалить" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Ошибка при фиксировании" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -424,26 +424,26 @@ msgstr "" "ниже. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Восстановление первоначального состояния системы" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Проверка менеджера пакетов" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Обновление информации о репозитории" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Неверная информация о пакете" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -456,19 +456,19 @@ msgstr "" "найден.\n" "Это говорит о серьезной проблеме, пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Запрос подтверждения" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Обновление" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Поиск устаревших программ" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Обновление системы завершено." @@ -531,11 +531,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Не найдена команда 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Произошла неисправимая ошибка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -549,7 +549,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -557,7 +557,7 @@ msgstr[0] "%s пакет будет удален." msgstr[1] "%s пакета будут удалены." msgstr[2] "%s пакетов будут удалены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -565,7 +565,7 @@ msgstr[0] "%s новый пакет будет установлен." msgstr[1] "%s новых пакета будут установлены." msgstr[2] "%s новых пакетов будут установлены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -573,7 +573,7 @@ msgstr[0] "%s пакет будет обновлен." msgstr[1] "%s пакета будут обновлены." msgstr[2] "%s пакетов будут обновлены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -581,7 +581,7 @@ msgid "" "You have to download a total of %s. " msgstr "Всего требуется загрузить %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -590,69 +590,69 @@ msgstr "" "Обновление может занять несколько часов и не может быть прервано в любой " "момент." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Чтобы избежать потерь данных, закройте все открытые приложения и документы." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Обновления не найдены" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Система уже обновлена." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Удалить %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Установить %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Обновить %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Осталось приблизительно %li дней %li часов %li минут" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Осталось приблизительно %li часов %li минут" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Требуется перезагрузка" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Обновление завершено и требуется перезагрузка. Перезагрузиться сейчас?" @@ -890,76 +890,71 @@ msgstr "Обновить систему до последней версии Ubu msgid "Other updates" msgstr "Установить обновления" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Невозможно установить все доступные обновления" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Некоторые обновления требуют удаления других приложений. Для полного " -"обновления системы используйте функцию \"Пометить все обновления\" менеджера " -"пакетов \"Synaptic\" или запустите в терминале \"sudo apt-get dist-upgrade\"." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Следующие обновления будут пропущены:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Загрузка списка изменений..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Размер загружаемых данных: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Ваша система не требует обновления" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -967,35 +962,35 @@ msgstr[0] "Вы можете установить %s обновление" msgstr[1] "Вы можете установить %s обновления" msgstr[2] "Вы можете установить %s обновлений" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Пожалуйста подождите, это может занять некоторое время." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Обновление завершено" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Новая версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Ваша версия Ubuntu больше не поддерживается" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1005,17 +1000,17 @@ msgstr "" "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для " "получения информации об обновлении посетите http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "Доступен новый релиз дистрибутива '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Индекс программ поврежден" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1499,6 +1494,12 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Официально поддерживается" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1541,8 +1542,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "Официально поддерживается" +msgid "No longer oficially supported" +msgstr "Некоторые программы больше не поддерживаются официально" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1613,6 +1614,19 @@ msgstr "DFSG-совместимое ПО с зависимостями от не msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-совместимое ПО" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Некоторые обновления требуют удаления других приложений. Для полного " +#~ "обновления системы используйте функцию \"Пометить все обновления\" " +#~ "менеджера пакетов \"Synaptic\" или запустите в терминале \"sudo apt-get " +#~ "dist-upgrade\"." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Следующие обновления будут пропущены:" + #~ msgid "About %li seconds remaining" #~ msgstr "Осталось приблизительно %li секунд" diff --git a/po/rw.po b/po/rw.po index acd54bf5..c19cfd45 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -88,50 +88,50 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Ibihuzagihe bya porogaramumudasobwa" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 #, fuzzy msgid "Error importing selected file" msgstr "Kuzaza Byahiswemo IDOSIYE" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 #, fuzzy msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 #, fuzzy msgid "Error removing the key" msgstr "i Urufunguzo" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 #, fuzzy msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -139,38 +139,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -180,23 +180,23 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -204,11 +204,11 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -231,15 +231,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -247,11 +247,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -264,11 +264,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -277,43 +277,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "i Urufunguzo" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -322,15 +322,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -339,21 +339,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -362,50 +362,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "Muyobozi ni" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -415,20 +415,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -489,11 +489,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -503,25 +503,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -529,75 +529,75 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 #, fuzzy msgid "Your system has already been upgraded." msgstr "Sisitemu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -822,128 +822,125 @@ msgstr "" msgid "Other updates" msgstr "Kwinjiza porogaramu" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:277 -#, fuzzy -msgid "The following updates will be skipped:" -msgstr "OYA" - -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, fuzzy, python-format msgid "Version %s: \n" msgstr "Verisiyo \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Iyimura... i" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "Sisitemu ni Hejuru Kuri Itariki" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Sisitemu ni Hejuru Kuri Itariki" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verisiyo \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ikwirakwiza... ni Oya" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1412,6 +1409,11 @@ msgstr "5" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1454,7 +1456,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription @@ -1528,6 +1530,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "The following updates will be skipped:" +#~ msgstr "OYA" + #, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" diff --git a/po/sk.po b/po/sk.po index 79e7857d..bab83ef0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" @@ -80,48 +80,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Aktualizácie softvéru" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Zdrojový" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Zdrojový" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importovať kľúč" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Chyba pri importovaní vybraného súboru" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Vybraný súbor nie je autentifikačným kľúčom GPG alebo je poškodený." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Chyba pri odstraňovaní kľúča" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Vybraný kľúč nebolo možné odstrániť. Nahláste to ako chybu." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -132,19 +132,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Prosím, zadajte názov disku" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Prosím, vložte disk do mechaniky:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Poškodené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -152,20 +152,20 @@ msgstr "" "Váš systém obsahuje poškodené balíky, ktoré nemôžu byť týmto programom " "opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Nemôžem aktualizovať požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Musel by byť odstránený dôležitý balík" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Nemôžem vypočítať aktualizáciu" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -177,11 +177,11 @@ msgstr "" "ako chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíkov" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -191,23 +191,23 @@ msgstr "" "problémom v sieti. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam " "neoverených balíčkov." -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Nemôžem inštalovať '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Požadovaný balík nebolo možné nainštalovať. Nahláste to ako chybu. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Nemôžem odhadnúť meta balík." -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -235,15 +235,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Čítam vyrovnávaciu pamäť cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -251,11 +251,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Nebol nájdený vhodný server" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -275,11 +275,11 @@ msgstr "" "Pokiaľ zvolíte 'Nie', súbor nebude zmenený." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -293,11 +293,11 @@ msgstr "" "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor " "nebude zmenený." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Neplatná informácia o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -305,11 +305,11 @@ msgstr "" "Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. " "Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Zdroje tretích strán sú zakázané" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -319,11 +319,11 @@ msgstr "" "Môžete ich povoliť po upgrade pomocou nástroja 'vlastnosti-softwaru' alebo " "pomocou synapticu." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Chyba počas aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -331,11 +331,11 @@ msgstr "" "Počas aktualizácie sa objavil problém, ktorý je zvyčajne spôsobený chybou " "sieťového pripojenia, preto skontrolujte vaše pripojenie a skúste znova." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Nedostatok voľného miesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -347,15 +347,15 @@ msgstr "" "súborov z predchádzajúcich inštalácií pomocou príkazu 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Chcete začať s aktualizáciou?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Nebolo možné nainštalovať aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -367,11 +367,11 @@ msgstr "" "Aktualizácia teraz skončí. Váš systém môže byť v nepoužiteľnom stave, preto " "bol spustený príkaz na zotavenie sa z tohto stavu (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Nebolo možné stiahnuť požadované balíky" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -379,11 +379,11 @@ msgstr "" "Aktualizácia bola neočakávane prerušená. Skontrolujte svoje internetové " "pripojenie alebo inštalačné médiá a skúste znova. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Niektoré programy už nie sú viac oficiálne podporované" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -397,23 +397,23 @@ msgstr "" "Pokiaľ nemáte zapnutý komunitou spravovaný zdroj softvéru 'universe', budú " "tieto balíky v ďalšom kroku navrhnuté na odstránenie. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Odstrániť zastarané balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Preskočiť tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Odstrániť" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Chyba počas potvrdzovania" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -422,26 +422,26 @@ msgstr "" "uvedené správy. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Obnovuje sa pôvodný stav systému" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Kontrola správcu balíkov" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Aktualizácia informácií o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Neplatná informácia o balíku" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -454,19 +454,19 @@ msgstr "" "s'.\n" "To znamená závažný problém. Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Požaduje sa potvrdenie" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Prebieha aktualizácia" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Vyhľadávanie zastaraného softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Aktualizácia systému je dokončená." @@ -529,11 +529,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Príkaz 'diff' nebol nájdený." -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Nastala závažná chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -549,7 +549,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -557,7 +557,7 @@ msgstr[0] "Bude odstránený %s balík." msgstr[1] "Budú odstránené %s balíky." msgstr[2] "Bude odstránených %s balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -565,7 +565,7 @@ msgstr[0] "Bude nainštalovaný %s nový balík." msgstr[1] "Budú nainštalované %s nové balíky." msgstr[2] "Bude nainštalovaných %s nových balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -573,7 +573,7 @@ msgstr[0] "Bude aktualizovaný %s balík." msgstr[1] "Budú aktualizované %s balíky." msgstr[2] "Bude aktualizovaných %s balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -581,76 +581,76 @@ msgid "" "You have to download a total of %s. " msgstr "Musíte stiahnuť celkom %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pre zamedzenie straty dát, zavrite všetky otvorené programy a dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Nemôžno nájsť žiadne aktualizácie" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Váš systém už bol aktualizovaný." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Odstrániť %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Inštalovať %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Aktualizovať %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Zostáva %li dní %li hodín %li minút" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Zostáva %li hodín %li minút" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Je potrebný reštart" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -889,77 +889,71 @@ msgstr "Aktualizovať na najnovšiu verziu Ubuntu" msgid "Other updates" msgstr "Nainštalovať _aktualizácie" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Niektoré aktualizácie vyžadujú odstránenie iných programov. Aby ste vykonali " -"úplnú aktualizáciu použite funkciu \"Označiť všetky aktualizácie\" správcu " -"balíkov \"Synaptic\" alebo spustite \"sudo apt-get dist-upgrade\" v " -"termináli." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Nasledujúce balíky nebudú aktualizované:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Verzia %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Získava sa zoznam zmien..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Veľkosť na stiahnutie: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Váš systém je aktuálny" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -967,35 +961,35 @@ msgstr[0] "Môžete nainštalovať %s aktualizáciu" msgstr[1] "Môžete nainštalovať %s aktualizácie" msgstr[2] "Môžete nainštalovať %s aktualizácií" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Čakajte prosím, toto môže chvíľu trvať." -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Aktualizácia je dokončená" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nová verzia: %s (veľkosť: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verzia %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Vaša distribúcia už nie je podporovaná" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1006,17 +1000,17 @@ msgstr "" "Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu." "com.\"" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Index softvéru je poškodený" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1508,6 +1502,11 @@ msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Oficiálne podporované" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1550,8 +1549,9 @@ msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Oficiálne podporované" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Niektoré programy už nie sú viac oficiálne podporované" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1620,6 +1620,19 @@ msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére" msgid "Non-DFSG-compatible Software" msgstr "Softvér nekompatibilný s DFSG" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Niektoré aktualizácie vyžadujú odstránenie iných programov. Aby ste " +#~ "vykonali úplnú aktualizáciu použite funkciu \"Označiť všetky aktualizácie" +#~ "\" správcu balíkov \"Synaptic\" alebo spustite \"sudo apt-get dist-upgrade" +#~ "\" v termináli." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Nasledujúce balíky nebudú aktualizované:" + #~ msgid "About %li seconds remaining" #~ msgstr "Zostáva %li sekúnd" diff --git a/po/sr.po b/po/sr.po index 9f207df9..67267f54 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic \n" "Language-Team: Serbian \n" @@ -81,45 +81,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importiranje kljuca" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -127,38 +127,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -167,34 +167,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -217,15 +217,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -233,11 +233,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -250,11 +250,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -263,42 +263,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -307,15 +307,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -324,21 +324,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -347,49 +347,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -399,19 +399,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -471,11 +471,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -485,7 +485,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -493,7 +493,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -501,7 +501,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -509,7 +509,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -517,74 +517,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -799,73 +799,71 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -873,52 +871,52 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1351,6 +1349,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1388,7 +1391,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/sv.po b/po/sv.po index f204ba57..73b452a0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors \n" "Language-Team: Swedish \n" @@ -80,51 +80,51 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Programvaruuppdateringar" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 #, fuzzy msgid "Active" msgstr "Aktivera" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Källkod" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Källkod" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Importera nyckel" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Fel vid importing av vald fil" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Den valda filen verkar inte vara en GPG-nyckel eller så är filen trasig." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Fel vid borttagning av nyckeln" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nyckeln du valde kan inte tas bort. Var vänlig anmäl detta som en bugg." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -135,19 +135,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Skriv in ett namn på skivan" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Sätt in en skiva i enheten:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Trasiga paket" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -156,20 +156,20 @@ msgstr "" "programmet. Reparera dem först med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Kan inte uppdatera obligatoriska meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Ett grundläggande paket skulle behöva tas bort" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Kunde inte beräkna uppdateringen" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -181,11 +181,11 @@ msgstr "" "vänlig rapportera detta som en bugg. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisiera vissa paket" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -195,12 +195,12 @@ msgstr "" "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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Kan inte installera \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -209,11 +209,11 @@ msgstr "" "rapportera detta som en bugg. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Kan inte gissa meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -242,15 +242,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Läser cache" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -258,11 +258,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Hittade ingen giltig serverspegel" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -282,11 +282,11 @@ msgstr "" "Om du väljer \"nej\" kommer uppdateringen avbrytas." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "Lägg till standardförråd?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -299,11 +299,11 @@ msgstr "" "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" kommer " "uppdateringen avbrytas." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Information om förråd ogiltig" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -311,11 +311,11 @@ msgstr "" "Uppdatering av förrådsinformationen orsakade en ogiltig fil. Var vänlig " "rapportera detta som en bugg." -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Tredjepartskällor inaktiverade" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -325,11 +325,11 @@ msgstr "" "aktivera dem efter uppgraderingen med verktyget \"software-properties\" " "eller med synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Fel vid uppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -338,11 +338,11 @@ msgstr "" "av nätverksproblem, var god kontrollera din nätverksanslutning och försök " "igen." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Inte tillräckligt med ledigt diskutrymme" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -354,15 +354,15 @@ msgstr "" "använda 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Vill du starta uppdateringen?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Det gick inte att installera uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -374,11 +374,11 @@ msgstr "" "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart tillstånd. " "En återställning kördes (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Det gick inte ladda ner uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -386,11 +386,11 @@ msgstr "" "Uppdateringen avbryts nu. Var god kontrollera din internetanslutning eller " "ditt installationsmedia och försök igen. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "Viss programvara har inte längre officiellt stöd" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -402,23 +402,23 @@ msgstr "" "gemenskapsunderhållna ('universe').Om du inte har 'universe' aktiverat " "kommer dessa paket föreslås för borttagning i nästa steg. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "Ta bort föråldrade paket?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_Hoppa över det här steget" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Ta bort" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "Fel inträffade vid utförandet" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -427,26 +427,26 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "Återställer systemstatus" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Kontrollerar pakethanterare" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Uppdaterar förrådsinformation" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Ogiltig paketinformation" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -459,19 +459,19 @@ msgstr "" "nödvändiga paketet \"%s\" längre.\n" "Det här tyder på ett alvarligt fel, var god och rapportera detto som en bugg." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Ber om bekräftelse" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Uppgraderar" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Söker efter föråldrad mjukvara" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Systemuppdateringen är klar." @@ -534,11 +534,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Kommandot \"diff\" hittades inte" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Ett kritiskt fel uppstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -553,28 +553,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paket kommer att tas bort." msgstr[1] "%s paket kommer att tas bort." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s nytt paket kommer att installeras." msgstr[1] "%s nya paket kommer att installeras." -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paket kommer att uppgraderas." msgstr[1] "%s paket kommer att uppgraderas." -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -582,7 +582,7 @@ msgid "" "You have to download a total of %s. " msgstr "Du behöver ladda ner totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -590,68 +590,68 @@ msgid "" msgstr "" "Uppdateringen kan ta flera timmar och kan inte avbrytas någon gång senare." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "Stäng alla öppna program och dokument för att undvika dataförlust." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Kunde inte hitta några uppgraderingar" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Ditt system har redan uppgraderats." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "Ta bort %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "Installera %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "Uppgradera %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Omkring %li dagar, %li timmar och %li minuter återstår" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Omkring %li timmar och %li minuter återstår" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, fuzzy, python-format msgid "%li seconds" msgstr "sekunder" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Omstart krävs" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -893,114 +893,108 @@ msgstr "Uppdatera till senaste versionen av Ubuntu" msgid "Other updates" msgstr "Uppdateringar" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "Det går inte att installera alla tillgängliga uppdateringar" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"Vissa uppdateringar kräver att andra program avinstalleras. Använd " -"funktionen \"Markera alla Uppgraderingar\" i packethanteraren Synaptic eller " -"kör \"sudo apt-get dist-upgrade\" i en terminal för att uppdatera ditt " -"system helt och hållet." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "Följande uppdateringar kommer att hoppas över" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "Hämtar lista med ändringar..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "Markera _inga" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "Markera _alla" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 #, fuzzy msgid "None" msgstr "en" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 #, fuzzy msgid "1 KB" msgstr "%d kB" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, fuzzy, python-format msgid "%.0f KB" msgstr "%.2f MB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, fuzzy, python-format msgid "%.1f MB" msgstr "%.2f MB" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "Nerladdningsstorlek: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "Ditt system är uppdaterat" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installera %s uppdatering" msgstr[1] "Du kan installera %s uppdateringar" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "Var god vänta, det här kan ta lite tid" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "Uppdateringen är färdig" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny version: %s (Storlek: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s:" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, fuzzy, python-format msgid "(Size: %s)" msgstr "Storlek:" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "Din distribution stöds inte längre" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1010,17 +1004,17 @@ msgstr "" "till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer " "information om att uppgradera." -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "Indexet för program är trasigt" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1513,6 +1507,11 @@ msgstr "Ubuntu 5.10 \"Breezy Badger\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "Stöds officiellt" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1554,8 +1553,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "Stöds officiellt" +#, fuzzy +msgid "No longer oficially supported" +msgstr "Viss programvara har inte längre officiellt stöd" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1626,6 +1626,19 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden" msgid "Non-DFSG-compatible Software" msgstr "Inte DFSG-kompatibel programvara" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "Vissa uppdateringar kräver att andra program avinstalleras. Använd " +#~ "funktionen \"Markera alla Uppgraderingar\" i packethanteraren Synaptic " +#~ "eller kör \"sudo apt-get dist-upgrade\" i en terminal för att uppdatera " +#~ "ditt system helt och hållet." + +#~ msgid "The following updates will be skipped:" +#~ msgstr "Följande uppdateringar kommer att hoppas över" + #~ msgid "About %li seconds remaining" #~ msgstr "Omkring %li sekunder återstår" diff --git a/po/th.po b/po/th.po index b74c14ea..013adc5c 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" @@ -79,46 +79,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "ซอฟต์แวร์ปรับปรุง" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "นำเข้ากุญแจ" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "ไม่สามารถนำเข้าไฟล์ที่เลือกไว้" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "ไฟล์ที่เลือกไว้อาจจะไม่ใช่ GPG กุญแจไฟล์หรืออาจจะเสียหาย" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "มีปัญหาขณะลบกุจแจ" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -129,19 +129,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิสก์" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "แพกเกจเสียหาย" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -149,20 +149,20 @@ msgstr "" "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic " "หรือ apt-get ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "แพจเกจที่สำคัญจะถูกลบออก" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "ไม่สามารถคำนวนการปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -172,11 +172,11 @@ msgid "" msgstr "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,23 +185,23 @@ msgstr "" "ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย " "คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน" -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "ไม่สามารถติดตั้ง '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -229,15 +229,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "กำลังอ่านจากที่เก็บชั่วคราว" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -245,11 +245,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -268,11 +268,11 @@ msgstr "" "ถ้าคุณเลือก 'no' การปรับปรุงจะถูกยกเลิก" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "สร้าง default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -284,21 +284,21 @@ msgstr "" "\n" "ควรเพิ่มรายการสำหรับ '%s' หรือไม่?ถ้าคุณเลือก 'No' การปรับปรุงจะถูกยกเลิก" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "แหล่งอื่นๆใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -308,11 +308,11 @@ msgstr "" "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' " "หรือด้วยโปรแกรม synaptic" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "เกิดข้อผิดพลาดขณะปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -320,11 +320,11 @@ msgstr "" "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติแล้วจะเป็นปัญหาด้านเครือข่าย " "กรุณาตรวจสอบการสื่อสารในเครือข่ายของคุณแล้วลองใหม่อีกที" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -335,15 +335,15 @@ msgstr "" "เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "ไม่สามารถปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -355,11 +355,11 @@ msgstr "" "การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --" "configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -367,11 +367,11 @@ msgstr "" "การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation " "mediaและลองอีกครั้ง " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -384,50 +384,50 @@ msgstr "" "\\n\n" "ถ้าคุณไม่ได้เลือกใช้แหล่งข้อมูล 'universe' แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "_ข้ามขั้นตอนนี้" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "เ_อาออก" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 #, fuzzy msgid "Restoring original system state" msgstr "เริ่มระบบใหม่อีกครั้ง" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -439,19 +439,19 @@ msgstr "" "หลังจากการปรับปรุงข้อมูลของแพจเกจ แพจเกจที่จำเป็น '%s'ได้หายไป\n" "นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "_ถามการยืนยันจากคุณก่อน" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "กำลังปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "ปรับปรุงระบบเสร็จแล้ว" @@ -514,11 +514,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "ไม่เจอคำสั่ง 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "เกิดข้อผิดพลาดอย่างร้ายแรง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -532,25 +532,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s แพกเกจจะถูกลบออก" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s แพกเกจใหม่จะถูกติดตั้ง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s แพกเกจจะถูกปรับปรุง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -558,75 +558,75 @@ msgid "" "You have to download a total of %s. " msgstr "คุณจะต้องดาวน์โหลดทั้งหมด %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "การปรับปรุงอาจจะใช้เวลานานหลายชั่วโมงและไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "เพื่อป้องกันข้อมูลสูญหายกรุณาออกจากทุกโปรแกรมและเอกสารที่เปิดอยู่" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "ไม่มีอะไรให้ปรับปรุง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "ระบบของคุณได้ผ่านการปรับปรุงแล้ว" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "ลบออก %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "ติดตั้ง %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "ปรับปรุงรุ่น %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "เหลือประมาณ %li วัน %li ชั่วโมง %li นาที" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "เหลือประมาณ %li ชั่วโมง %li นาที" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "ต้องเริ่มระบบใหม่" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "การปรับปรุงเสร็จสิ้นแล้วและต้องการที่จะเริ่มระบบใหม่ คุณต้องการที่จะทำเดี๋ยวนี้หรือเปล่า?" @@ -851,110 +851,105 @@ msgstr "ปรับปรุงให้เป็นรุ่นล่าสุ msgid "Other updates" msgstr "_ติดตั้งปรัยปรุง" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"การปรับปรุงบางอันต้องการที่จะลบซอฟแวร์ออกอีก กรุณาใช้ตัวเลือก \"Mark All Upgrades\" " -"ของโปรแกรมจัดการแพกเกจ \"Synaptic\" หรือใช้คำสั่ง \"sudo apt-get dist-upgrade\" " -"ในเทอร์มินัล ในการปรับปรุงระบบของคุณให้เสร็จสิ้นสมบรูณ์" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "การปรับปรุงต่อไปนี้จะถูกข้ามไป:" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "รุ่น %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "ขนาดดาวน์โหลด: %s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "ระบบของคุณทันสมัยแล้ว" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "ปรับปรุงเสร็จสิ้นแล้ว" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "รุ่นใหม่: %s (ขนาด: %s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "รุ่น %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -964,17 +959,17 @@ msgstr "" "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com " "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "ดัชนีของซอฟแวร์เสียหาย" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1448,6 +1443,12 @@ msgstr "อูบันตู 5.10 'Breezy Badger'" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "สนับสนุนอย่างเป็นทางการ" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1490,8 +1491,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "สนับสนุนอย่างเป็นทางการ" +msgid "No longer oficially supported" +msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1562,6 +1563,18 @@ msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอ msgid "Non-DFSG-compatible Software" msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "การปรับปรุงบางอันต้องการที่จะลบซอฟแวร์ออกอีก กรุณาใช้ตัวเลือก \"Mark All Upgrades\" " +#~ "ของโปรแกรมจัดการแพกเกจ \"Synaptic\" หรือใช้คำสั่ง \"sudo apt-get dist-upgrade" +#~ "\" ในเทอร์มินัล ในการปรับปรุงระบบของคุณให้เสร็จสิ้นสมบรูณ์" + +#~ msgid "The following updates will be skipped:" +#~ msgstr "การปรับปรุงต่อไปนี้จะถูกข้ามไป:" + #~ msgid "About %li seconds remaining" #~ msgstr "เหลือประมาณ %li วินาที" diff --git a/po/tr.po b/po/tr.po index 7b802529..bcf26874 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI \n" "Language-Team: Turkish \n" @@ -80,46 +80,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Kanal Düzenle" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Anahtar aktar" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Seçili dosyayı aktarmada hata" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Seçili dosya bir GPG anahtar dosyası olmayabilir veya bozuk olabilir." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Anahtar kaldırmada hata" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Seçtiğiniz anahtar kaldırılamadı. Lütfen bunu bir hata olarak iletin." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -130,19 +130,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Lütfen disk için bir isim girin" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Lütfen sürücüye bir disk yerleştirin:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Bozuk paketler" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -150,20 +150,20 @@ msgstr "" "Sisteminiz bu yazılım ile düzeltilemeyen bozuk paketler içeriyor. Devam " "etmeden önce lütfen bunları synaptic veya apt-get kullanarak düzeltin." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -172,34 +172,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "'%s' yüklenemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Gerekli bir paket yüklenemedi. Lütfen bunu bir hata olarak bildirin. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -226,15 +226,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Önbellek okunuyor" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -242,11 +242,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "Geçerli yansı bulunamadı" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -259,11 +259,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -276,32 +276,32 @@ msgstr "" "'%s' için varsayılan girişler eklensin mi? Eğer 'Hayır'ı seçerseniz, " "güncelleştirme iptal edilecektir." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "Üçüncü parti kaynaklar devredışı bırakıldı" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "Güncelleştirme sırasında hata" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -309,11 +309,11 @@ msgstr "" "Güncelleştirme sırasında bir hata oluştu. Bu genellikle bir ağ sorunudur, " "lütfen ağ bağlantınızı kontrol edin ve yeniden deneyin." -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Yeterince boş disk alanı yok" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -322,15 +322,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Yükseltmeyi başlatmak istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Yükseltmeler kurulamadı" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -339,11 +339,11 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Yükseltmeler indirilemedi" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -351,11 +351,11 @@ msgstr "" "Yükseltme şimdi iptal edilecek. Lütfen internet bağlantınızı veya kurulum " "ortamınızı kontrol edin ve yeniden deneyin. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -364,49 +364,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "Bu Adımı _Atla" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "_Kaldır" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "Geçersiz paket bilgisi" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -416,19 +416,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "Yükseltiliyor" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Sistem yükseltmesi tamamlandı." @@ -489,11 +489,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "'diff' komutu bulunamadı" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -503,25 +503,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -529,74 +529,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Sisteminiz zaten yükseltilmiş." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "%s'i kur" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "%s'i yükselt" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Yeniden başlatma gerekiyor" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -818,124 +818,122 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1378,6 +1376,12 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Resmi olarak desteklenenler" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1420,7 +1424,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Resmi olarak desteklenenler" #. CompDescription diff --git a/po/uk.po b/po/uk.po index 5049ce5f..d9e4931b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff \n" "Language-Team: Ukrainian \n" @@ -80,48 +80,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Оновлення програм" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Текст програми" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Текст програми" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "Імпортувати ключ" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Помилка імпорту вибраного файлу" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Помилка видалення ключа" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -129,19 +129,19 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "Введіть назву диску" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "Вставте диск в пристрій:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "Пошкоджені пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -149,20 +149,20 @@ msgstr "" "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені " "цією програмою. Скористайтесь перш програмами synaptic чи apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "Не можливо поновити необхідні meta-пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "Це призведе довидалення базового пакунку системи" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "Не можливо розрахувати поновлення" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -172,23 +172,23 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "Помилка підписів в деяких пакунках" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -196,11 +196,11 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -223,15 +223,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "Зчитування кешу" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -239,12 +239,12 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 #, fuzzy msgid "No valid mirror found" msgstr "Не знайдено" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -257,11 +257,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,43 +270,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "Помилка в даних про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "Помилка підчас поновлення" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "Недостатньо місця на диску" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -315,15 +315,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "Бажаєте почати апгрейд системи?" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "Неможливо провести апргрейд системи" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -336,11 +336,11 @@ msgstr "" "Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою " "Synaptic для налаштування системи." -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "Неможливо завантажити пакунки для апргрейду системи" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -348,11 +348,11 @@ msgstr "" "Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з " "інтернетом чи носії та спробуйте знов. " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -361,24 +361,24 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 #, fuzzy msgid "Remove obsolete packages?" msgstr "Видалити непотрібні пакунки?" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -387,27 +387,27 @@ msgstr "" "нижче. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 #, fuzzy msgid "Restoring original system state" msgstr "Перезавантаження системи" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "Перевірка програми управління пакунками" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "Отримання інформації про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -417,20 +417,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "Запит підтвердження" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "Пошук програм, що не використовуються" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "Апргрейд системи завершено." @@ -492,11 +492,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "Виникла невиправна помилка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -509,7 +509,7 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -517,7 +517,7 @@ msgstr[0] "%s пакунків буде видалено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -525,7 +525,7 @@ msgstr[0] "%s пакунків буде встановлено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -533,7 +533,7 @@ msgstr[0] "буде проведено апргрейд %s пакунків." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -541,7 +541,7 @@ msgid "" "You have to download a total of %s. " msgstr "Потрібно завантажити всього %s пакунків." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -550,68 +550,68 @@ msgstr "" "Апрейд може продовжуватись декілька годин, і не може бути перервано протягом " "всього часу." -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "Не знайдено пакунків для апгрейду" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "Апгрейд вашої системи вже проведено." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, fuzzy, python-format msgid "Remove %s" msgstr "Видалити %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, fuzzy, python-format msgid "Install %s" msgstr "Встановити %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Апргрейд %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "Необхідно перезавантажити систему" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -845,7 +845,6 @@ msgstr "Апгрейд системи Ubuntu" msgid "Other updates" msgstr "Встановлення оновлень..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Cannot install all available updates" @@ -853,68 +852,67 @@ msgstr "Пошук пакунків для апгрейду" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Версія %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Завантаження змін" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "Ваша система оновлена!" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -922,54 +920,54 @@ msgstr[0] "Неможливо провести апргрейд системи" msgstr[1] "Неможливо провести апргрейд системи" msgstr[2] "Неможливо провести апргрейд системи" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 #, fuzzy msgid "Update is complete" msgstr "Завантадення пакунків завершено" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версія %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ваш дистрибутив вже не підтримується" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1444,6 +1442,12 @@ msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Офіціально підтримуються" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1487,7 +1491,7 @@ msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Офіціально підтримуються" #. CompDescription diff --git a/po/update-manager.pot b/po/update-manager.pot index 9cea7704..8df83d5f 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -80,45 +80,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -126,38 +126,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -166,34 +166,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -216,15 +216,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -232,11 +232,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -249,11 +249,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -262,42 +262,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -306,15 +306,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -323,21 +323,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -346,49 +346,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -398,19 +398,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -470,11 +470,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -484,28 +484,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -513,74 +513,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -795,125 +795,123 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1346,6 +1344,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1383,7 +1386,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/ur.po b/po/ur.po index aa76eddb..0ca4f881 100644 --- a/po/ur.po +++ b/po/ur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -80,46 +80,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 #, fuzzy msgid "Import key" msgstr "امپورٹ کی" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -127,38 +127,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -167,34 +167,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -217,15 +217,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -233,11 +233,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -250,11 +250,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -263,42 +263,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -307,15 +307,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -324,21 +324,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -347,49 +347,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -399,19 +399,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -471,11 +471,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -485,28 +485,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -514,74 +514,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -796,125 +796,123 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1348,6 +1346,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1385,7 +1388,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/urd.po b/po/urd.po index 6629ac1c..19309f94 100644 --- a/po/urd.po +++ b/po/urd.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -80,46 +80,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 #, fuzzy msgid "Import key" msgstr "امپورٹ کی" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -127,38 +127,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -167,34 +167,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -217,15 +217,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -233,11 +233,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -250,11 +250,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -263,42 +263,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -307,15 +307,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -324,21 +324,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -347,49 +347,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -399,19 +399,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -471,11 +471,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -485,28 +485,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -514,74 +514,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -796,125 +796,123 @@ msgstr "" msgid "Other updates" msgstr "" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1348,6 +1346,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1385,7 +1388,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/vi.po b/po/vi.po index 849598ae..d2b8372b 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" @@ -79,48 +79,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Bản cập nhật phần mềm" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "Nguồn" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "Nguồn" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "Gặp lỗi khi nhập tâp tin đã chọn" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này." -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -128,38 +128,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -169,23 +169,23 @@ msgid "" msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -193,11 +193,11 @@ msgid "" msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -220,15 +220,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -236,11 +236,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -253,11 +253,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -266,43 +266,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -311,15 +311,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -328,21 +328,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -351,50 +351,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "Một bộ quản lý gói khác đang chạy" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -404,20 +404,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "Nâng cấp xong" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -478,11 +478,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -492,25 +492,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -518,74 +518,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -811,7 +811,6 @@ msgstr "" msgid "Other updates" msgstr "Đang cài đặt bản cập nhật..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Cannot install all available updates" @@ -819,120 +818,119 @@ msgstr "Đang kiểm tra có cập nhật..." #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "Phiên bản %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "Đang tải các thay đổi" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "Hệ thống bạn toàn mới nhất." -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Phiên bản %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Không còn hỗ trợ lại bản phát hành của bạn." -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1404,6 +1402,12 @@ msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "Được hỗ trợ một cách chính thức" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1447,7 +1451,7 @@ msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "Được hỗ trợ một cách chính thức" #. CompDescription diff --git a/po/xh.po b/po/xh.po index 590257a2..3150d03d 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -80,46 +80,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "Bonisa izihlaziyo" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -127,38 +127,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 msgid "" "A unresolvable problem occured while calculating the upgrade.\n" "\n" @@ -167,34 +167,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -217,15 +217,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -233,11 +233,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -250,11 +250,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -263,42 +263,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -307,15 +307,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -324,21 +324,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -347,49 +347,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -399,19 +399,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -471,11 +471,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -485,28 +485,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -514,74 +514,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -799,125 +799,123 @@ msgstr "" msgid "Other updates" msgstr "Bonisa izihlaziyo" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1360,6 +1358,11 @@ msgstr "" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "" + #. Description #: ../data/channels/Ubuntu.info.in:213 msgid "Ubuntu 5.04 Security Updates" @@ -1397,7 +1400,7 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "" #. CompDescription diff --git a/po/zh_CN.po b/po/zh_CN.po index b0d5d452..bf3055a0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_CN \n" @@ -79,52 +79,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "软件更新" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "" "二进制\n" "源代码" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "" "二进制\n" "源代码" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "导入密钥" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "在导入所选文件时出错" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "所选文件可能不是GPG密钥文件或者已经损坏." -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "删除密钥时候出错" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你所选择的密钥不能被删除。请汇报这个bug" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -135,19 +135,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "请输入光盘的名称" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "请将光盘插入到光驱里:" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "破损的软件包" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -155,20 +155,20 @@ msgstr "" "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者" "apt-get修复它们。" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "不能升级要求的元包" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "一个必要的软件包会被删除" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "无法计算升级" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -178,11 +178,11 @@ msgid "" msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "在认证一些软件包时出错" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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 " @@ -191,23 +191,23 @@ msgstr "" "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软" "件包的列表。" -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "无法安装'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "无法安装要求的软件包。请汇报这个bug。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "无法猜出元包" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -234,15 +234,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "正在读取缓存" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -250,11 +250,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "未找到可用的镜像" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -271,11 +271,11 @@ msgstr "" "如果选'no'更新将被取消." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "生成默认的源?" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -287,21 +287,21 @@ msgstr "" "\n" "添加用于'%s'的缺省条目?如果选择'No',升级将被取消." -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "源的信息无效" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "第三方源被禁用" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -310,21 +310,21 @@ msgstr "" "源列表中一些第三方源被禁用.你可以在升级后用\"软件属性\"工具或新立得包管理器来" "重新启用它们." -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "升级时出错" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "升级时候出错。这通常是一些网络问题，请检查你的网络连接后再试。" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "磁盘空间不足" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -335,15 +335,15 @@ msgstr "" "get clean'命令来删除之前安装的临时软件包。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "你要开始升级么？" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "无法安装升级" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -355,21 +355,21 @@ msgstr "" "升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -" "a)。" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "无法下载升级包" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "一些软件已经不在被官方支持." -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -381,49 +381,49 @@ msgstr "" "\n" "如果你没有启用'社区维护'源,下一步这些包将被建议移除. " -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "删除陈旧的软件包？" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "跳过这个步骤(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "删除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "确认时出错" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理时发生问题。更多信息请查看以下消息。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "正在恢复原始系统状态" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "正在检查软件包管理器" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "更新源的信息" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "无效的包信息" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -435,19 +435,19 @@ msgstr "" "包信息被更新后核心包'%s'没有找到.\n" "这标志着一个严重的错误,请报告bug." -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "请求确认" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "正在更新" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "寻找陈旧的软件包" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "系统更新完毕" @@ -510,11 +510,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "外部命令“diff”没有找到" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "出现致命错误" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -528,25 +528,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s软件包将被删除。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s新的软件包将被安装。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s软件包将被升级" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -554,75 +554,75 @@ msgid "" "You have to download a total of %s. " msgstr "你下载了总体的%s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "升级会持续几个小时且不能在稍后的任何时候被终止" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "关闭所有打开的程序和文档以防止数据丢失。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "不能找到任何升级" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "你的系统已经升级。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "删除%s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "安装%s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "升级%s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "大约还要%li天%li小时%li分钟" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, fuzzy, python-format msgid "%li hours %li minutes" msgstr "大约还要%li天%li小时" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "需要重启" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升级已经完成并需要重启。你要现在重启么？" @@ -846,109 +846,105 @@ msgstr "升级到最新版本的Ubuntu" msgid "Other updates" msgstr "安装更新" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "无法安装所有升级" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"一些更新包要求删除更多的软件。用包管理器 “Synaptic” 的“标出所有更新”功能并运" -"行 “sudo apt-get dist-upgrade”来彻底更你新的系统。" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "将跳过以下的升级包" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "正在下载更新列表..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "下载文件大小：%s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "您的系统已为最新" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "你可以安装 %s 个更新" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "请稍等，这需要花一些时间。" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新版本：%s(大小：%s)" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "您的发行版不再被支持" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -958,17 +954,17 @@ msgstr "" "\r\n" "http://www.ubuntu.com 来获取更多有关升级的信息。" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "新发行版 '%s' 可用" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "软件索引已被破坏" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1450,6 +1446,11 @@ msgstr "Ubuntu 5.04 安全更新" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 安全更新" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +msgid "Oficially supported" +msgstr "官方支持" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1491,8 +1492,9 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 -msgid "Oficially supported" -msgstr "官方支持" +#, fuzzy +msgid "No longer oficially supported" +msgstr "一些软件已经不在被官方支持." #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1562,6 +1564,17 @@ msgstr "带有非自由依赖关系的DFSG兼容软件" msgid "Non-DFSG-compatible Software" msgstr "非DFSG兼容软件" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "一些更新包要求删除更多的软件。用包管理器 “Synaptic” 的“标出所有更新”功能并" +#~ "运行 “sudo apt-get dist-upgrade”来彻底更你新的系统。" + +#~ msgid "The following updates will be skipped:" +#~ msgstr "将跳过以下的升级包" + #~ msgid "About %li seconds remaining" #~ msgstr "大约还要%li秒" diff --git a/po/zh_HK.po b/po/zh_HK.po index 59eeff12..0f4a3c0e 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -79,48 +79,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "軟件更新" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 #, fuzzy msgid "(Source Code)" msgstr "源程式碼" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 #, fuzzy msgid "Source Code" msgstr "源程式碼" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -128,38 +128,38 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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 "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -169,23 +169,23 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -193,11 +193,11 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -220,15 +220,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -236,11 +236,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -253,11 +253,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -266,43 +266,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 #, fuzzy msgid "Error during update" msgstr "移除密碼匙時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -311,15 +311,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -328,21 +328,21 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -351,50 +351,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -404,20 +404,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "" @@ -478,11 +478,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 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 aborts " @@ -492,28 +492,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, python-format msgid "" "\n" @@ -521,74 +521,74 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -812,7 +812,6 @@ msgstr "" msgid "Other updates" msgstr "正在安裝軟件更新..." -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Cannot install all available updates" @@ -820,121 +819,120 @@ msgstr "正在檢查更新套件..." #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "版本 %s: \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 #, fuzzy msgid "Downloading the list of changes..." msgstr "正在下載更改紀錄" -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 #, fuzzy msgid "Your system is up-to-date" msgstr "系統已經在最新狀態！" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "已經不再支援你用的發行版本" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1405,6 +1403,12 @@ msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "官方支援" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1448,7 +1452,7 @@ msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" +msgid "No longer oficially supported" msgstr "官方支援" #. CompDescription diff --git a/po/zh_TW.po b/po/zh_TW.po index 5e3888d3..f73c1f29 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-08-30 11:31+0200\n" +"POT-Creation-Date: 2006-09-05 13:07+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan \n" "Language-Team: Chinese (Taiwan) \n" @@ -78,46 +78,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:544 -#: ../SoftwareProperties/SoftwareProperties.py:561 +#: ../SoftwareProperties/SoftwareProperties.py:580 +#: ../SoftwareProperties/SoftwareProperties.py:597 #, fuzzy msgid "Software Channel" msgstr "軟體更新" -#: ../SoftwareProperties/SoftwareProperties.py:552 -#: ../SoftwareProperties/SoftwareProperties.py:569 +#: ../SoftwareProperties/SoftwareProperties.py:588 +#: ../SoftwareProperties/SoftwareProperties.py:605 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:653 +#: ../SoftwareProperties/SoftwareProperties.py:690 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:659 +#: ../SoftwareProperties/SoftwareProperties.py:696 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:908 +#: ../SoftwareProperties/SoftwareProperties.py:945 msgid "Import key" msgstr "匯入金鑰" -#: ../SoftwareProperties/SoftwareProperties.py:918 +#: ../SoftwareProperties/SoftwareProperties.py:955 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:919 +#: ../SoftwareProperties/SoftwareProperties.py:956 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:931 +#: ../SoftwareProperties/SoftwareProperties.py:968 msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:932 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:978 +#: ../SoftwareProperties/SoftwareProperties.py:1015 #, python-format msgid "" "Error scaning the CD\n" @@ -128,19 +128,19 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1035 +#: ../SoftwareProperties/SoftwareProperties.py:1072 msgid "Please enter a name for the disc" msgstr "請輸入光碟的名稱" -#: ../SoftwareProperties/SoftwareProperties.py:1051 +#: ../SoftwareProperties/SoftwareProperties.py:1088 msgid "Please insert a disc in the drive:" msgstr "請將光碟放入光碟機：" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:89 msgid "Broken packages" msgstr "不完整套件" -#: ../DistUpgrade/DistUpgradeCache.py:94 +#: ../DistUpgrade/DistUpgradeCache.py:90 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." @@ -148,20 +148,20 @@ msgstr "" "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 " "synaptic 或 apt-get 來修恢它們。" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Can't upgrade required meta-packages" msgstr "無法升級須要的元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:154 msgid "A essential package would have to be removed" msgstr "將會移除的核心套件" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "Could not calculate the upgrade" msgstr "無法計算升級" -#: ../DistUpgrade/DistUpgradeCache.py:162 +#: ../DistUpgrade/DistUpgradeCache.py:158 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade.\n" @@ -171,11 +171,11 @@ msgid "" msgstr "計算升級時發生無法解決的問題，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" -#: ../DistUpgrade/DistUpgradeCache.py:188 +#: ../DistUpgrade/DistUpgradeCache.py:184 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,23 +184,23 @@ msgstr "" "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證" "的套件。" -#: ../DistUpgrade/DistUpgradeCache.py:251 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, python-format msgid "Can't install '%s'" msgstr "無法安裝‘%s’" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:250 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "無法安裝須要的套件，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:259 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:258 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -227,15 +227,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:94 +#: ../DistUpgrade/DistUpgradeControler.py:104 msgid "Reading cache" msgstr "正在讀取快取" -#: ../DistUpgrade/DistUpgradeControler.py:131 +#: ../DistUpgrade/DistUpgradeControler.py:143 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:132 +#: ../DistUpgrade/DistUpgradeControler.py:144 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -243,11 +243,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:223 +#: ../DistUpgrade/DistUpgradeControler.py:235 msgid "No valid mirror found" msgstr "找不到有效的 mirror" -#: ../DistUpgrade/DistUpgradeControler.py:224 +#: ../DistUpgrade/DistUpgradeControler.py:236 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -266,11 +266,11 @@ msgstr "" "如果選擇「否」，則更新會被取消。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:241 +#: ../DistUpgrade/DistUpgradeControler.py:253 msgid "Generate default sources?" msgstr "產生預設的來源？" -#: ../DistUpgrade/DistUpgradeControler.py:242 +#: ../DistUpgrade/DistUpgradeControler.py:254 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -282,21 +282,21 @@ msgstr "" "\n" "需要加入預設的 '%s' 項目嗎？如果你選擇「否」，更新將會被取消。" -#: ../DistUpgrade/DistUpgradeControler.py:276 +#: ../DistUpgrade/DistUpgradeControler.py:288 msgid "Repository information invalid" msgstr "無效的套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:277 +#: ../DistUpgrade/DistUpgradeControler.py:289 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升級套件庫時導致無效的檔案。請匯報問題。" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:295 msgid "Third party sources disabled" msgstr "停用第三方來源" -#: ../DistUpgrade/DistUpgradeControler.py:284 +#: ../DistUpgrade/DistUpgradeControler.py:296 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -305,21 +305,21 @@ msgstr "" "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-" "properties' 工具或 synaptic升級後，你可以重新啟用它。" -#: ../DistUpgrade/DistUpgradeControler.py:333 +#: ../DistUpgrade/DistUpgradeControler.py:345 msgid "Error during update" msgstr "更新時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "更新時發生錯誤。這可能是某些網路問題，試檢查網路連線及再試。" -#: ../DistUpgrade/DistUpgradeControler.py:343 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "Not enough free disk space" msgstr "磁碟空間不足" -#: ../DistUpgrade/DistUpgradeControler.py:344 +#: ../DistUpgrade/DistUpgradeControler.py:356 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -330,15 +330,15 @@ msgstr "" "clean'來移除先前安裝套件時的暫存檔。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:403 +#: ../DistUpgrade/DistUpgradeControler.py:415 msgid "Do you want to start the upgrade?" msgstr "是否要開始升級？" -#: ../DistUpgrade/DistUpgradeControler.py:420 +#: ../DistUpgrade/DistUpgradeControler.py:432 msgid "Could not install the upgrades" msgstr "無法安裝升級" -#: ../DistUpgrade/DistUpgradeControler.py:421 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -350,21 +350,21 @@ msgstr "" "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --" "configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:451 msgid "Could not download the upgrades" msgstr "無法下載升級套件" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:452 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升級現正中止。請檢查網路連線是否正常及再試 " -#: ../DistUpgrade/DistUpgradeControler.py:476 +#: ../DistUpgrade/DistUpgradeControler.py:488 msgid "Some software no longer officially supported" msgstr "有些軟體不再有官方支援" -#: ../DistUpgrade/DistUpgradeControler.py:478 +#: ../DistUpgrade/DistUpgradeControler.py:490 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -373,49 +373,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:512 +#: ../DistUpgrade/DistUpgradeControler.py:524 msgid "Remove obsolete packages?" msgstr "移除不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Skip This Step" msgstr "略過這步驟(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:513 +#: ../DistUpgrade/DistUpgradeControler.py:525 msgid "_Remove" msgstr "移除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:523 +#: ../DistUpgrade/DistUpgradeControler.py:535 msgid "Error during commit" msgstr "提交時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:534 +#: ../DistUpgrade/DistUpgradeControler.py:546 msgid "Restoring original system state" msgstr "恢復原先的系統狀態" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:542 -#: ../DistUpgrade/DistUpgradeControler.py:571 +#: ../DistUpgrade/DistUpgradeControler.py:554 +#: ../DistUpgrade/DistUpgradeControler.py:583 msgid "Checking package manager" msgstr "正在檢查套件管理程式" -#: ../DistUpgrade/DistUpgradeControler.py:557 +#: ../DistUpgrade/DistUpgradeControler.py:569 msgid "Updating repository information" msgstr "正在更新套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:582 +#: ../DistUpgrade/DistUpgradeControler.py:594 msgid "Invalid package information" msgstr "無效的套件資訊" -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:595 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -425,19 +425,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:607 msgid "Asking for confirmation" msgstr "詢問以確認" -#: ../DistUpgrade/DistUpgradeControler.py:599 +#: ../DistUpgrade/DistUpgradeControler.py:611 msgid "Upgrading" msgstr "升級中" -#: ../DistUpgrade/DistUpgradeControler.py:606 +#: ../DistUpgrade/DistUpgradeControler.py:618 msgid "Searching for obsolete software" msgstr "尋搜不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:623 msgid "System upgrade is complete." msgstr "系統升級完成。" @@ -500,11 +500,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "找不到‘diff’指令" -#: ../DistUpgrade/DistUpgradeViewGtk.py:347 +#: ../DistUpgrade/DistUpgradeViewGtk.py:357 msgid "A fatal error occured" msgstr "發生嚴重錯誤" -#: ../DistUpgrade/DistUpgradeViewGtk.py:348 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -518,28 +518,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:460 +#: ../DistUpgrade/DistUpgradeViewGtk.py:475 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s 個套件將會移除。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s 個新套件將會安裝。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:471 +#: ../DistUpgrade/DistUpgradeViewGtk.py:486 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s 個套件將會升級。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:491 #, fuzzy, python-format msgid "" "\n" @@ -547,75 +547,75 @@ msgid "" "You have to download a total of %s. " msgstr "您總共需要下載 %s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "升級可能需要數小時及無法在稍後任何時間取消。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:485 +#: ../DistUpgrade/DistUpgradeViewGtk.py:500 msgid "To prevent data loss close all open applications and documents." msgstr "避免遺失請關閉所有已開啟的程式及文件。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:506 msgid "Could not find any upgrades" msgstr "無法找到任何升級" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:507 msgid "Your system has already been upgraded." msgstr "系統升級已經完成。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:522 #, python-format msgid "Remove %s" msgstr "移除 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:509 +#: ../DistUpgrade/DistUpgradeViewGtk.py:524 #, python-format msgid "Install %s" msgstr "安裝 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:511 +#: ../DistUpgrade/DistUpgradeViewGtk.py:526 #, python-format msgid "Upgrade %s" msgstr "升級 %s" -#: ../DistUpgrade/DistUpgradeView.py:25 +#: ../DistUpgrade/DistUpgradeView.py:27 #, python-format msgid "%li days %li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:27 +#: ../DistUpgrade/DistUpgradeView.py:29 #, python-format msgid "%li hours %li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:29 +#: ../DistUpgrade/DistUpgradeView.py:31 #, python-format msgid "%li minutes" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:30 +#: ../DistUpgrade/DistUpgradeView.py:32 #, python-format msgid "%li seconds" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:36 +#: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 56k modem and about %s with a 1Mbit " "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:94 +#: ../DistUpgrade/DistUpgradeView.py:105 msgid "Reboot required" msgstr "須要重新開機" -#: ../DistUpgrade/DistUpgradeView.py:95 +#: ../DistUpgrade/DistUpgradeView.py:106 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升級已經完成及須要重新啟動。現在要重新啟動嗎？" @@ -839,110 +839,106 @@ msgstr "升級到最新版本的 Ubuntu" msgid "Other updates" msgstr "安裝更新套件(_I)" -#. print "WARNING, keeping packages" #: ../UpdateManager/UpdateManager.py:266 msgid "Cannot install all available updates" msgstr "無法安裝所有更新套件" #: ../UpdateManager/UpdateManager.py:267 msgid "" -"Some updates require the removal of further software. Use the function " -"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -"get dist-upgrade\" in a terminal to update your system completely." +"Some of the updates require more extensive changesthan expected.\n" +"\n" +"This usually mean that your system is not fully upgraded or that you run a " +"development release of the distribution.\n" +"\n" +"Would you like to perform a full distribution upgrade now?" msgstr "" -"有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」功能" -"或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "The following updates will be skipped:" -msgstr "會略過更新以下套件：" -#: ../UpdateManager/UpdateManager.py:470 +#: ../UpdateManager/UpdateManager.py:461 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:531 +#: ../UpdateManager/UpdateManager.py:522 msgid "Downloading the list of changes..." msgstr "正在下載修改紀錄..." -#: ../UpdateManager/UpdateManager.py:555 +#: ../UpdateManager/UpdateManager.py:546 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:560 +#: ../UpdateManager/UpdateManager.py:551 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:591 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:603 +#: ../UpdateManager/UpdateManager.py:594 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:597 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:609 +#: ../UpdateManager/UpdateManager.py:600 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627 -#: ../UpdateManager/UpdateManager.py:651 +#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:642 #, python-format msgid "Download size: %s" msgstr "下載大小：%s" -#: ../UpdateManager/UpdateManager.py:636 +#: ../UpdateManager/UpdateManager.py:627 msgid "Your system is up-to-date" msgstr "系統已經在最新狀態" -#: ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:638 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "您可以安裝 %s 個更新" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:671 msgid "Please wait, this can take some time." msgstr "請稍候，這可能需要一點時間。" -#: ../UpdateManager/UpdateManager.py:682 +#: ../UpdateManager/UpdateManager.py:673 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:831 +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新版本：%s （大小：%s）" -#: ../UpdateManager/UpdateManager.py:835 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:837 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:851 +#: ../UpdateManager/UpdateManager.py:842 msgid "Your distribution is not supported anymore" msgstr "您正使用的發行版本已不再支援" -#: ../UpdateManager/UpdateManager.py:852 +#: ../UpdateManager/UpdateManager.py:843 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -951,17 +947,17 @@ msgstr "" "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 " "http://www.ubuntu.com以取得更多升級資訊。" -#: ../UpdateManager/UpdateManager.py:871 +#: ../UpdateManager/UpdateManager.py:862 #, python-format msgid "New distribution release '%s' is available" msgstr "有新的 distribution 發行版 '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:906 +#: ../UpdateManager/UpdateManager.py:897 msgid "Software index is broken" msgstr "軟體索引損壞" -#: ../UpdateManager/UpdateManager.py:907 +#: ../UpdateManager/UpdateManager.py:898 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 " @@ -1435,6 +1431,12 @@ msgstr "Ubuntu 5.10 ‘Breezy Badger’" msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:203 +#, fuzzy +msgid "Oficially supported" +msgstr "官方支援" + #. Description #: ../data/channels/Ubuntu.info.in:213 #, fuzzy @@ -1477,8 +1479,8 @@ msgstr "" #. CompDescription #: ../data/channels/Ubuntu.info.in:254 #, fuzzy -msgid "Oficially supported" -msgstr "官方支援" +msgid "No longer oficially supported" +msgstr "有些軟體不再有官方支援" #. CompDescription #: ../data/channels/Ubuntu.info.in:257 @@ -1549,6 +1551,17 @@ msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體" msgid "Non-DFSG-compatible Software" msgstr "不符合 DFSG 的軟體" +#~ msgid "" +#~ "Some updates require the removal of further software. Use the function " +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." +#~ msgstr "" +#~ "有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」" +#~ "功能或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。" + +#~ msgid "The following updates will be skipped:" +#~ msgstr "會略過更新以下套件：" + #~ msgid "Download is complete" #~ msgstr "下載完成" diff --git a/setup.py b/setup.py index 7892f0e0..c1f40439 100755 --- a/setup.py +++ b/setup.py @@ -72,6 +72,7 @@ setup(name='update-manager', ), ('share/update-manager/', glob.glob("DistUpgrade/*.cfg") + glob.glob("DistUpgrade/*.cfg") ), ('share/doc/update-manager', glob.glob("data/channels/README.channels") diff --git a/update-manager b/update-manager index 5982cab9..ebd8339a 100644 --- a/update-manager +++ b/update-manager @@ -55,10 +55,31 @@ if __name__ == "__main__": dest="devel_release", default=False, help="Check if upgrading to the latest devel release " "is possible") + parser.add_option ("--dist-upgrade","--dist-ugprade", action="store_true", + dest="dist_upgrade", default=False, + help="Try to run a dist-upgrade") (options, args) = parser.parse_args() data_dir="/usr/share/update-manager/" #data_dir="/tmp/xxx/share/update-manager/" - app = UpdateManager(data_dir) - app.main(options) + + if options.dist_upgrade == True: + from DistUpgrade.DistUpgradeView import STEP_PREPARE, STEP_MODIFY_SOURCES, STEP_FETCH_INSTALL, STEP_CLEANUP, STEP_REBOOT + from DistUpgrade.DistUpgradeViewGtk import DistUpgradeViewGtk + from DistUpgrade.DistUpgradeControler import DistUpgradeControler + # FIXME: we *really* want to different view here + view = DistUpgradeViewGtk(data_dir) + view.setStep(STEP_PREPARE) + view.hideStep(STEP_MODIFY_SOURCES) + view.hideStep(STEP_REBOOT) + controler = DistUpgradeControler(view, datadir=data_dir) + controler.openCache() + if controler.askDistUpgrade(): + view.setStep(STEP_FETCH_INSTALL) + controler.doDistUpgrade() + view.setStep(STEP_CLEANUP) + controler.doPostUpgrade() + else: + app = UpdateManager(data_dir) + app.main(options) -- cgit v1.2.3