diff options
| -rw-r--r-- | DistUpgrade/Changelog | 18 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgrade.cfg | 5 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeCache.py | 36 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 23 | ||||
| -rw-r--r-- | DistUpgrade/README | 6 | ||||
| -rw-r--r-- | DistUpgrade/ReleaseAnnouncement | 2 | ||||
| -rwxr-xr-x | DistUpgrade/cdromupgrade | 4 | ||||
| -rw-r--r-- | SoftwareProperties/SoftwareProperties.py | 3 | ||||
| -rw-r--r-- | UpdateManager/Common/aptsources.py | 16 | ||||
| -rw-r--r-- | UpdateManager/Common/utils.py | 19 | ||||
| -rw-r--r-- | UpdateManager/GtkProgress.py | 13 | ||||
| -rw-r--r-- | UpdateManager/UpdateManager.py | 51 | ||||
| -rw-r--r-- | data/glade/SoftwareProperties.glade | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/ar.po | 292 | ||||
| -rw-r--r-- | po/bg.po | 316 | ||||
| -rw-r--r-- | po/bn.po | 306 | ||||
| -rw-r--r-- | po/br.po | 292 | ||||
| -rw-r--r-- | po/ca.po | 317 | ||||
| -rw-r--r-- | po/cs.po | 316 | ||||
| -rw-r--r-- | po/da.po | 316 | ||||
| -rw-r--r-- | po/de.po | 317 | ||||
| -rw-r--r-- | po/el.po | 316 | ||||
| -rw-r--r-- | po/en_AU.po | 316 | ||||
| -rw-r--r-- | po/en_CA.po | 303 | ||||
| -rw-r--r-- | po/en_GB.po | 301 | ||||
| -rw-r--r-- | po/es.po | 316 | ||||
| -rw-r--r-- | po/fi.po | 318 | ||||
| -rw-r--r-- | po/fr.po | 316 | ||||
| -rw-r--r-- | po/fur.po | 292 | ||||
| -rw-r--r-- | po/gl.po | 296 | ||||
| -rw-r--r-- | po/he.po | 304 | ||||
| -rw-r--r-- | po/hi.po | 292 | ||||
| -rw-r--r-- | po/hr.po | 316 | ||||
| -rw-r--r-- | po/hu.po | 316 | ||||
| -rw-r--r-- | po/id.po | 316 | ||||
| -rw-r--r-- | po/it.po | 316 | ||||
| -rw-r--r-- | po/ja.po | 316 | ||||
| -rw-r--r-- | po/ka.po | 306 | ||||
| -rw-r--r-- | po/ko.po | 316 | ||||
| -rw-r--r-- | po/ku.po | 295 | ||||
| -rw-r--r-- | po/lt.po | 315 | ||||
| -rw-r--r-- | po/mk.po | 296 | ||||
| -rw-r--r-- | po/ms.po | 292 | ||||
| -rw-r--r-- | po/nb.po | 316 | ||||
| -rw-r--r-- | po/ne.po | 301 | ||||
| -rw-r--r-- | po/nl.po | 316 | ||||
| -rw-r--r-- | po/no.po | 301 | ||||
| -rw-r--r-- | po/oc.po | 300 | ||||
| -rw-r--r-- | po/pa.po | 303 | ||||
| -rw-r--r-- | po/pl.po | 316 | ||||
| -rw-r--r-- | po/pt.po | 316 | ||||
| -rw-r--r-- | po/pt_BR.po | 316 | ||||
| -rw-r--r-- | po/ro.po | 298 | ||||
| -rw-r--r-- | po/ru.po | 316 | ||||
| -rw-r--r-- | po/rw.po | 298 | ||||
| -rw-r--r-- | po/sk.po | 316 | ||||
| -rw-r--r-- | po/sr.po | 292 | ||||
| -rw-r--r-- | po/sv.po | 320 | ||||
| -rw-r--r-- | po/th.po | 316 | ||||
| -rw-r--r-- | po/tr.po | 292 | ||||
| -rw-r--r-- | po/uk.po | 307 | ||||
| -rw-r--r-- | po/update-manager.pot | 292 | ||||
| -rw-r--r-- | po/ur.po | 292 | ||||
| -rw-r--r-- | po/urd.po | 292 | ||||
| -rw-r--r-- | po/vi.po | 296 | ||||
| -rw-r--r-- | po/xh.po | 296 | ||||
| -rw-r--r-- | po/zh_CN.po | 316 | ||||
| -rw-r--r-- | po/zh_HK.po | 296 | ||||
| -rw-r--r-- | po/zh_TW.po | 316 | ||||
| -rw-r--r-- | utils/demoted.cfg | 373 | ||||
| -rwxr-xr-x | utils/demotions.py | 14 |
73 files changed, 8962 insertions, 8812 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 54d194e6..5f7ba584 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,21 @@ +2006-09-29: + - typo fix (thanks to Jane Silber) (lp: #62946) +2006-09-28: + - bugfix in the cdromupgrade script +2006-09-27: + - uploaded a version that only reverts the backport fetching + but no other changes compared to 2006-09-23 +2006-09-27: + - embarrassing bug cdromupgrade.sh +2006-09-26: + - comment out the getRequiredBackport code because we will + not use Breaks for the dapper->edgy upgrade yet + (see #54234 for the rationale) + - updated demotions.cfg for dapper->edgy + - special case the packages affected by the Breaks changes + - make sure that no translations get lost during the upgrade + (thanks to mdz for pointing this out) + - bugfixes 2006-09-23: - support fetching backports of selected packages first and use them for the upgrade (needed to support Breaks) diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index 60c3ca9f..b25def9a 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -11,6 +11,10 @@ PostUpgradePurge=xorg-common, libgl1-mesa Demotions=demoted.cfg RemoveEssentialOk=sysvinit RemovalBlacklistFile=removal_blacklist.cfg +# if those packages were installed, make sure to keep them installed +# we use this right now to emulate Breaks +KeepInstalledPkgs=gnumeric, gnumeric-gtk, hpijs +KeepInstalledSection=translations # information about the individual meta-pkgs [ubuntu-desktop] @@ -29,7 +33,6 @@ KeyDependencies=edubuntu-artwork, tuxpaint [xubuntu-desktop] KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfce4 - [Files] BackupExt=distUpgrade diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 8427bb3d..318c30cd 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -111,6 +111,39 @@ class MyCache(apt.Cache): if self.has_key(pkg): self._depcache.MarkDelete(self[pkg]._pkg,True) + def keepInstalledRule(self): + """ run after the dist-upgrade to ensure that certain + packages are kept installed """ + def keepInstalled(self, pkgname, reason): + if (self.has_key(pkgname) + and self[pkgname].isInstalled + and self[pkgname].markedDelete): + self.markInstall(pkgname, reason) + + # first the global list + for pkgname in self.config.getlist("Distro","KeepInstalledPkgs"): + keepInstalled(self, pkgname, "Distro KeepInstalledPkgs rule") + # the the per-metapkg rules + for key in self.metapkgs: + if self.has_key(key) and (self[key].isInstalled or + self[key].markedInstall): + for pkgname in self.config.getlist(key,"KeepInstalledPkgs"): + keepInstalled(self, pkgname, "%s KeepInstalledPkgs rule" % key) + # now the keepInstalledSection code + for section in self.config.getlist("Distro","KeepInstalledSection"): + for pkg in self: + if pkg.markedDelete and pkg.section == section: + keepInstalled(self, pkg.name, "Distro KeepInstalledSection rule: %s" % section) + # the the per-metapkg rules + for key in self.metapkgs: + if self.has_key(key) and (self[key].isInstalled or + self[key].markedInstall): + for section in self.config.getlist(key,"KeepInstalledSection"): + for pkg in self: + if pkg.markedDelete and pkg.section == section: + keepInstalled(self, pkg.name, "%s KeepInstalledSection rule: %s" % (key, section)) + + def postUpgradeRule(self): " run after the upgrade was done in the cache " for (rule, action) in [("Install", self.markInstall), @@ -149,6 +182,9 @@ class MyCache(apt.Cache): if not self._installMetaPkgs(view): raise SystemError, _("Can't upgrade required meta-packages") + # see if our KeepInstalled rules are honored + self.keepInstalledRule() + # and if we have some special rules self.postUpgradeRule() diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index e32c0c5f..7b255cf0 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -165,6 +165,7 @@ class DistUpgradeControler(object): # enable main (we always need this!) distro = Distribution() distro.get_sources(self.sources) + # make sure that main is enabled distro.enable_component(self.sources, "main") # this must map, i.e. second in "from" must be the second in "to" @@ -501,7 +502,7 @@ class DistUpgradeControler(object): "support for the following software " "packages. You can still get support " "from the community.\n\n" - "If you havn't enabled community " + "If you have not enabled community " "maintained software (universe), " "these packages will be suggested for " "removal in the next step."), @@ -551,9 +552,9 @@ class DistUpgradeControler(object): def abort(self): """ abort the upgrade, cleanup (as much as possible) """ - if hasattr(self, sources): + if hasattr(self, "sources"): self.sources.restoreBackup(self.sources_backup_ext) - if hasattr(self, aptcdrom): + if hasattr(self, "aptcdrom"): self.aptcdrom.restoreBackup(self.sources_backup_ext) # generate a new cache self._view.updateStatus(_("Restoring original system state")) @@ -622,14 +623,14 @@ class DistUpgradeControler(object): os.unlink(apt_pkg.Config.FindDir("Dir::Etc::sourceparts")+"/backport-source.list") apt_pkg.Config.Set("Dir::Cache::archives",cachedir) os.chdir(cwd) - return self.setupRequiredBackports(backportsdir) - - def setupRequiredBackports(self, backportsdir): - " setup the required backports in a evil way " # unpack it for deb in glob.glob(backportsdir+"/*.deb"): ret = os.system("dpkg-deb -x %s %s" % (deb, backportsdir)) # FIXME: do error checking + return self.setupRequiredBackports(backportsdir) + + def setupRequiredBackports(self, backportsdir): + " setup the required backports in a evil way " # setup some pathes to make sure the new stuff is used os.environ["LD_LIBRARY_PATH"] = backportsdir+"/usr/lib" os.environ["PYTHONPATH"] = backportsdir+"/usr/lib/python2.4/site-packages/" @@ -653,9 +654,11 @@ class DistUpgradeControler(object): if not self.prepare(): self.abort(1) - if self.options and self.options.haveBackports == False: - # get backported packages (if needed) - self.getRequiredBackports() + # mvo: commented out for now, see #54234, this needs to be + # refactored to use a arch=any tarball + #if self.options and self.options.haveBackports == False: + # # get backported packages (if needed) + # self.getRequiredBackports() # run a "apt-get update" now if not self.doUpdate(): diff --git a/DistUpgrade/README b/DistUpgrade/README index c38a422f..b9d6c5d2 100644 --- a/DistUpgrade/README +++ b/DistUpgrade/README @@ -32,6 +32,12 @@ ForcedObsoletes: happens *after* the cache.commit()) RemoveEssentialOk: Those packages are ok to remove even though they are essential +KeepInstalledPkgs: + If the package was installed before, it should still be installed + after the upgrade +KeepInstalledSection: + Packages from this section that were installed should always be + installed afterwards as well (useful for eg translations) [$meta-pkg] KeyDependencies: diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement index 98eca455..6d9adb2c 100644 --- a/DistUpgrade/ReleaseAnnouncement +++ b/DistUpgrade/ReleaseAnnouncement @@ -1,7 +1,7 @@ Welcome to Ubuntu 6.10 'Edgy Eft' --------------------------------- -*WARNING: THIS IS A DEVELOPMENT SNAPSHOT* +*WARNING: THIS IS A BETA RELEASE* The Ubuntu team is proud to announce Ubuntu 6.10 'Edgy Eft'. diff --git a/DistUpgrade/cdromupgrade b/DistUpgrade/cdromupgrade index 9ed8cdea..37335045 100755 --- a/DistUpgrade/cdromupgrade +++ b/DistUpgrade/cdromupgrade @@ -23,10 +23,10 @@ if [ ! -f $fullpath/$CODENAME.tar.gz ]; then exit 1 fi -TMPDIR=$(mktemp -d distupgrade.XXXXXX) +TMPDIR=$(mktemp -d) cd $TMPDIR tar xzf $fullpath/$CODENAME.tar.gz -if [ ! -x $TMPDIR/$CODENAME ]; +if [ ! -x $TMPDIR/$CODENAME ]; then echo "Could not find the upgrade application in the archive, exiting" exit 1 fi diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 1c8a3425..14ddeefc 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -482,6 +482,9 @@ class SoftwareProperties(SimpleGladeApp): for source in self.distro.child_sources: if source.template == template: self.sourceslist.remove(source) + for source in self.distro.source_code_sources: + if source.template == template: + self.sourceslist.remove(source) else: self.distro.add_source(self.sourceslist, uri=template.base_uri, diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index 836b8fae..06d83e01 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -619,6 +619,8 @@ class Distribution: # e.g. "dapper", "dapper-updates") comps_per_dist = {} for s in sources: + if s.type != "deb": + continue if not comps_per_dist.has_key(s.dist): comps_per_dist[s.dist] = set() map(comps_per_dist[s.dist].add, s.comps) @@ -631,10 +633,18 @@ class Distribution: for source in sources: add_component_only_once(source, comps_per_dist) + # now do the same for source dists if self.get_source_code == True: - for source in self.source_code_sources: - if comp not in source.comps: - add_component_only_once(source, comps_per_dist) + comps_per_dist = {} + for s in self.source_code_sources: + if s.type != "deb-src": + continue + if not comps_per_dist.has_key(s.dist): + comps_per_dist[s.dist] = set() + map(comps_per_dist[s.dist].add, s.comps) + for source in self.source_code_sources: + if comp not in source.comps: + add_component_only_once(source, comps_per_dist) def disable_component(self, sourceslist, comp): diff --git a/UpdateManager/Common/utils.py b/UpdateManager/Common/utils.py index 099cbfed..1fcd022f 100644 --- a/UpdateManager/Common/utils.py +++ b/UpdateManager/Common/utils.py @@ -1,4 +1,6 @@ import gtk +from gettext import gettext as _ +import locale def str_to_bool(str): if str == "0" or str.upper() == "FALSE": @@ -21,3 +23,20 @@ def error(parent, summary, message): res = d.run() d.destroy() return + +def humanize_size(bytes): + """ + Convert a given size in bytes to a nicer better readable unit + """ + if bytes == 0: + # TRANSLATORS: download size is 0 + return _("None") + elif bytes < 1024: + # TRANSLATORS: download size of very small updates + return _("1 KB") + elif bytes < 1024 * 1024: + # TRANSLATORS: download size of small updates, e.g. "250 KB" + return locale.format(_("%.0f KB"), bytes/1024) + else: + # TRANSLATORS: download size of updates, e.g. "2.3 MB" + return locale.format(_("%.1f MB"), bytes / 1024 / 1024) diff --git a/UpdateManager/GtkProgress.py b/UpdateManager/GtkProgress.py index 54f60384..cb635e87 100644 --- a/UpdateManager/GtkProgress.py +++ b/UpdateManager/GtkProgress.py @@ -25,6 +25,7 @@ import gtk import apt import apt_pkg from gettext import gettext as _ +from Common.utils import * # intervals of the start up progress # 3x caching and menu creation @@ -104,12 +105,14 @@ class GtkFetchProgress(apt.progress.FetchProgress): if currentItem > self.totalItems: currentItem = self.totalItems if self.currentCPS > 0: - statusText = (_("Downloading file %li of %li with %s/s" - % (currentItem, self.totalItems, - apt_pkg.SizeToStr(self.currentCPS)))) + statusText = (_("Downloading file %(current)li of %(total)li with " + "%(speed)s/s") % {"current" : currentItem, + "total" : self.totalItems, + "speed" : humanize_size(self.currentCPS)}) else: - statusText = (_("Downloading file %li of %li with unknown " - "speed") % (currentItem, self.totalItems)) + statusText = (_("Downloading file %(current)li of %(total)li") % \ + {"current" : currentItem, + "total" : self.totalItems }) self.progress.set_fraction(self.percent/100.0) self.status.set_markup("<i>%s</i>" % statusText) # TRANSLATORS: show the remaining time in a progress bar: diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 63d0eab9..04ad107c 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -237,7 +237,7 @@ class UpdateList: ("%s-updates" % dist, "Ubuntu", _("Recommended updates"), 9), ("%s-proposed" % dist, "Ubuntu", _("Proposed updates"), 8), ("%s-backports" % dist, "Ubuntu", _("Backports"), 7), - (dist, "Ubuntu", _("Normal updates"), 6)] + (dist, "Ubuntu", _("Distribution updates"), 6)] self.pkgs = {} self.matcher = {} @@ -576,23 +576,6 @@ class UpdateManager(SimpleGladeApp): self.treeview_update.queue_draw() self.setBusy(False) - def humanize_size(self, bytes): - """ - Convert a given size in bytes to a nicer better readable unit - """ - if bytes == 0: - # TRANSLATORS: download size is 0 - return _("None") - elif bytes < 1024: - # TRANSLATORS: download size of very small updates - return _("1 KB") - elif bytes < 1024 * 1024: - # TRANSLATORS: download size of small updates, e.g. "250 KB" - return locale.format(_("%.0f KB"), bytes/1024) - else: - # TRANSLATORS: download size of updates, e.g. "2.3 MB" - return locale.format(_("%.1f MB"), bytes / 1024 / 1024) - def setBusy(self, flag): """ Show a watch cursor if the app is busy for more than 0.3 sec. Furthermore provide a loop to handle user interface events """ @@ -609,8 +592,8 @@ class UpdateManager(SimpleGladeApp): self.button_install.set_sensitive(self.cache.installCount) self.dl_size = self.cache.requiredDownload # TRANSLATORS: b stands for Bytes - self.label_downsize.set_markup(_("Download size: %s" % \ - self.humanize_size(self.dl_size))) + self.label_downsize.set_markup(_("Download size: %s") % \ + humanize_size(self.dl_size)) def update_count(self): """activate or disable widgets and show dialog texts correspoding to @@ -618,7 +601,7 @@ class UpdateManager(SimpleGladeApp): self.refresh_updates_count() num_updates = self.cache.installCount if num_updates == 0: - text_header= "<big><b>"+_("Your system is up-to-date")+"</b></big>" + text_header= "<big><b>%s</b></big>" %_("Your system is up-to-date") text_download = "" self.notebook_details.set_sensitive(False) self.treeview_update.set_sensitive(False) @@ -628,12 +611,12 @@ class UpdateManager(SimpleGladeApp): self.textview_changes.get_buffer().set_text("") self.textview_descr.get_buffer().set_text("") else: - text_header = "<big><b>" + \ - gettext.ngettext("You can install %s update", - "You can install %s updates", - num_updates) % \ - num_updates + "</b></big>" - text_download = _("Download size: %s") % self.humanize_size(self.dl_size) + text_header = "<big><b>%s</b></big>" % \ + (gettext.ngettext("You can install %s update", + "You can install %s updates", + num_updates) % \ + num_updates) + text_download = _("Download size: %s") % humanize_size(self.dl_size) self.notebook_details.set_sensitive(True) self.treeview_update.set_sensitive(True) self.button_install.grab_default() @@ -820,16 +803,16 @@ class UpdateManager(SimpleGladeApp): for pkg in self.list.pkgs[origin]: name = xml.sax.saxutils.escape(pkg.name) summary = xml.sax.saxutils.escape(pkg.summary) - contents = "<b>%s</b>\n<small>%s\n" % (name, summary) + contents = "<b>%s</b>\n<small>%s</small>" % (name, summary) if pkg.installedVersion != None: - contents += _("From version %s to %s") % \ - (pkg.installedVersion, - pkg.candidateVersion) + version = _("From version %(old_version)s to %(new_version)s") %\ + {"old_version" : pkg.installedVersion, + "new_version" : pkg.candidateVersion} else: - contents += _("Version %s") % pkg.candidateVersion + version = _("Version %s") % pkg.candidateVersion #TRANSLATORS: the b stands for Bytes - contents += " " + _("(Size: %s)") % self.humanize_size(pkg.packageSize) - contents += "</small>" + size = _("(Size: %s)") % humanize_size(pkg.packageSize) + contents = "%s\n<small>%s %s</small>" % (contents, version, size) self.store.append([contents, pkg.name, pkg]) self.update_count() diff --git a/data/glade/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade index f280f8a3..d3947a33 100644 --- a/data/glade/SoftwareProperties.glade +++ b/data/glade/SoftwareProperties.glade @@ -804,7 +804,7 @@ <child> <widget class="GtkLabel" id="label21"> <property name="visible">True</property> - <property name="label">Add Cdrom</property> + <property name="label" translatable="yes">Add Cdrom</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> diff --git a/debian/changelog b/debian/changelog index d817dea3..8bc27537 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +update-manager (0.44.15) edgy; urgency=low + + * data/glade/SoftwareProperties.glade: + - fix missing "translatable" property (lp: #62681) + * missing i18n added (lp: 62519) + + -- + update-manager (0.44.14) edgy; urgency=low * UpdateManager/UpdateManager.py: @@ -5,7 +13,7 @@ update-manager (0.44.14) edgy; urgency=low * DistUprade/DistUpgradeControler.py: - check for self.sources, self.aptcdrom before using it (lp: #61852) - -- + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 23:17:27 +0200 update-manager (0.44.13) edgy; urgency=low diff --git a/po/POTFILES.in b/po/POTFILES.in index b383e84c..64774c4e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -12,6 +12,7 @@ UpdateManager/fakegconf.py UpdateManager/ReleaseNotesViewer.py UpdateManager/GtkProgress.py UpdateManager/UpdateManager.py +UpdateManager/Common/utils.py data/mime/apt.xml.in data/glade/UpdateManager.glade data/glade/SoftwareProperties.glade @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi <contact@jadmadi.net>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -88,45 +88,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "خطاء في استيراد الملف" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "خطاء في ازالة المفتاح" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -134,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "الرجاء ادخال اسم القرص" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "الرجاء ادخال القرص في الجهاز" @@ -152,20 +152,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -174,34 +174,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +228,11 @@ msgstr "" msgid "Reading cache" msgstr "قراءة من الكاش" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "importing" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "مصدر الطرف الثالث غير مفعل" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "خطاء خلال التحديث" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "لا يوجد مساحة كافية على القرص الصلب" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "هل تريد البدء في عملية التحديث الان؟" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,77 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -411,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -547,7 +547,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -771,14 +771,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -815,7 +815,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -829,46 +829,24 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -876,68 +854,90 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -953,34 +953,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -988,49 +984,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1062,73 +1058,77 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov <nikola.kasabov@gmail.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -88,50 +88,50 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Обновления на софтуера" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Изходен код" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Изходен код" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Внасяне на ключ" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Грешка при внасяне на избрания файл" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Избраният файл или не е GPG файл, или е повреден." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Грешка при премахване на ключа" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключът, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -142,11 +142,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Моля, въведете име за диска" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Моля, поставете диск в устройството:" @@ -163,20 +163,20 @@ msgstr "" "този софтуер. Моля, поправете ги със synaptic или apt-get преди да " "продължите!" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Не може да бъдат надградени изисквани мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "Ще трябва да бъде премахнат важен пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Не може да бъде планирано надграждането" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -188,11 +188,11 @@ msgstr "" "това като грешка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Грешка при удостоверяването автентичността на някои пакети" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -202,12 +202,12 @@ msgstr "" "да е временен проблем с мрежата. Може би бихте искали да опитате отново по-" "късно. Вижте по-долу списъка на неудоствоерените пакети." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Не може да се инсталира '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -216,11 +216,11 @@ msgstr "" "грешка! " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Не могат да бъдат предположени мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -253,11 +253,11 @@ msgstr "" msgid "Reading cache" msgstr "Четене на кеша" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -265,11 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Не е открит валиден огледален сървър" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -289,11 +289,11 @@ msgstr "" "Ако изберете \"Не\", актуализирането ще бъде отменено." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Генериране на източници по подразбиране?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -307,11 +307,11 @@ msgstr "" "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", " "актуализацията ще бъде отменена." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Информацията от хранилището е невалидна" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -319,11 +319,11 @@ msgstr "" "Надграждане на информацията от хранилището доведе до невалиден файл. Моля, " "съобщете това като грешка!" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Забранени са източници от трети страни" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -334,11 +334,11 @@ msgstr "" "Можете да ги разрешите отново след надграждането чрез инструмента software-" "properties или чрез synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Грешка по време на надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -346,11 +346,11 @@ msgstr "" "Възникна проблем при актуализацията. Това обикновено е накакъв проблем с " "мрежата. Моля, проверете мрежовата връзка и опитайте пак!" -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Недостатъчно свободно място на диска" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +359,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Желаете ли да започне надграждането?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Не можеше да бъдат инсталирани надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,11 +379,11 @@ msgstr "" "Надграждането сега ще бъде прекратено. Системата Ви може да е в " "неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Не можеше да бъдат свалени надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -391,36 +391,36 @@ msgstr "" "Надграждането се прекратява. Моля, проверете Интернет връзката или " "инсталационния носител и опитайте отново! " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Премахване на остарелите пакети?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "П_рескачане на стъпката" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Премахване" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Грешка при прехвърляне" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -429,32 +429,32 @@ msgstr "" "информация! " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Рестартиране на системата" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Проверка на диспечера на пакети" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Актуализиране информацията от хранилището" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 #, fuzzy msgid "Invalid package information" msgstr "Невалидна информация за пакет" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +467,19 @@ msgstr "" "бъде открит.\n" "Това показва сериозна грешка. Моля, съобщете за това!" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Запитване за потвърждение" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Търсене на остарял софтуер" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Надграждането на системата завърши." @@ -614,7 +614,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Системата Ви е актуална" @@ -856,15 +856,15 @@ msgstr "" "Идентификацията на надграждането е неуспешна. Възможно е да има проблем с " "мрежата или сървъра. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Сваляне на файл %li от %li при %s/сек" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Сваляне на файл %li от %li при неизвестна скорост" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Сваляне на файл %li от %li при %s/сек" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -906,8 +906,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Инсталиране на актуализациите" +msgid "Distribution updates" +msgstr "_Поднови надграждането" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -921,87 +921,66 @@ msgid "Version %s: \n" msgstr "Версия %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Сваляне на списъка с промени..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Проверка" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Размер за изтегляне: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Можете да инсталирате %s актуализация" msgstr[1] "Можете да инсталирате %s актуализации" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Моля, изчакайте! Това може да отнеме известно време." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Актуализацията е завършена" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_Инсталиране на актуализациите" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Нова версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуция вече не се поддържа" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1011,17 +990,17 @@ msgstr "" "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com " "за повече информация за надграждането!" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Индексът на софтуера е повреден" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1031,12 +1010,35 @@ msgstr "" "ползвайте диспечера на пакети \"Synaptic\" или първо задействайте \"sudo apt-" "get install -f\" в терминален прозорец, за да поправите този проблем!" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Ще трябва ръчно да проверите за актуализации</big></b>\n" "\n" @@ -1061,34 +1063,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Започване на надграждането?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Отмяна на _изтеглянето" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Провер_ка" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Проверка на софтуерните канали за нови актуализации" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Описание" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Бележки към изданието" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1096,15 +1094,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Показване напредъка на отделните файлове" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Актуализации на софтуера" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1112,37 +1110,37 @@ msgstr "" "Софтуерните актуализации поправят грешки, премахват уаизвими места в " "сигурността и предлагат нови възможности." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Надграждане" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Надграждане до последната версия на Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Проверка" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Поднови надграждането" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Скрий тази информация за в бъдеще" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Инсталиране на актуализациите" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1176,27 +1174,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Добавяне на Cdrom" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Идентифициране" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Изтриване на изтеглените софтуерни файлове:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Свалянето е завършено" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Внасяне на публичния ключ от доверен доставчик на софтуер" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Актуализации по Интернет" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1204,52 +1207,52 @@ msgstr "" "Само актуализации на сигурността от официалните сървъри на Ubuntu ще бъдат " "инсталирани автоматично" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Връщане на _стандартните стойности" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Връщане на стандартните ключове на Вашата дистрибуция" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Настройки на софтуера" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Изходен код" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Проверявай за актуализации автоматично:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "И_зтегли актуализациите във фонов режим, но не ги инсталирай" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "Внасяне на ключ" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Инсталирай актуализациите на сигурноста без потвърждение" @@ -1644,6 +1647,16 @@ msgstr "DFSG-съвместим софтуер с несвободни зави msgid "Non-DFSG-compatible Software" msgstr "Софтуер несъвместим с DFSG" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Сваляне на файл %li от %li при неизвестна скорост" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Инсталиране на актуализациите" + +#~ msgid "Cancel _Download" +#~ msgstr "Отмяна на _изтеглянето" + #~ msgid "Could not find any upgrades" #~ msgstr "Не можеше да бъдат намерени надграждания" @@ -1727,9 +1740,6 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Ключове</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Добавяне на Cdrom" - #~ msgid "Installation Media" #~ msgstr "Носител на инсталацията" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n" "Language-Team: Bengali <bn@li.org>\n" @@ -88,46 +88,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "সফ্টওয়্যার আপডেট" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "কী ইম্পোর্ট" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "নির্বাচিত ফাইলটি ইম্পোর্ট করতে সমস্যা হয়েছে" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "বেছে নেয়া ফাইলটি মনে হয় কোন GPG কী ফাইল নয় অথবা এটি নষ্ট।" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "কী সরাতে সমস্যা হয়েছে" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -138,11 +138,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "ডিস্কের জন্য একটি নাম দিন" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:" @@ -156,20 +156,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "আপগ্রেড গণনা করতে পারছে না" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -178,23 +178,23 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "'%s' ইন্সটল করা যাচ্ছে না" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -203,11 +203,11 @@ msgstr "" "রিপোর্ট করুন। " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "meta-package অনুমান করা যাচ্ছ না" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +235,11 @@ msgstr "" msgid "Reading cache" msgstr "ক্যাশ পড়া হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "কোন সঠিক মিরর পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "ডিফল্ট sources তৈরি করে?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -282,11 +282,11 @@ msgstr "" "'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট বাতিল " "হবে।" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "রিপোজিটরির তথ্য সঠিক নয়" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -294,22 +294,22 @@ msgstr "" "রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ " "হিসাবে রিপোর্ট করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "আপগ্রেড করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -317,11 +317,11 @@ msgstr "" "আপগ্রেড করার সময় একটি সমস্যা হয়েছে। এটি সাধারনত নেটওয়ার্কের সমস্যা, অনুগ্রহ করে " "আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -330,15 +330,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "আপনি কি আপগ্রেড শুরু করতে চান?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "আপগ্রেড ইন্সটল করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -347,11 +347,11 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "আপগ্রেড ডাউনলোড করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -359,67 +359,67 @@ msgstr "" "আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া পরীক্ষা " "করুন এবং আবার চেষ্টা করুন। " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "এই ধাপটি এড়িয়ে যাও (_এ)" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "সরাও (_স)" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "প্রেরণ করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "সিস্টেমটি রিস্টার্ট করছি" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "ভুল প্যাকেজ তথ্য" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -429,19 +429,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "তথ্যের জন্য জিজ্ঞাসা" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "আপগ্রেড করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "সিস্টেম আপগ্রেড সম্পন্ন।" @@ -566,7 +566,7 @@ msgstr "তথ্য হারাতে না চাইলে সকল অ্ #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "আপনার সিস্টেম আপ-টু-ডেট" @@ -794,14 +794,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -844,8 +844,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "আপডেট ইন্সটল করো (_I)" +msgid "Distribution updates" +msgstr "পুনরায় আপগ্রেড শুরু (_R)" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -859,116 +859,117 @@ msgid "Version %s: \n" msgstr "ভার্সন %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "পরীক্ষা করো (_C)" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "ডাউনলোড এর আকার: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন" msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "আপডেট সম্পন্ন" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "নতুন ভার্সন: %s (আকার: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "ভার্সন %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -989,34 +990,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>আপগ্রেড শুরু করবো?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "ডাউনলোড বাতিল (_D)" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "পরিবর্তন" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "পরীক্ষা করো (_k)" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "নতুন আপডেট এর জন্য সফ্টওয়্যার চ্যানেল পরীক্ষা করো" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "বর্ননা" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "রিলিজ নোট" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1024,51 +1021,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "একটি ফাইলের অগ্রগতি দেখাও" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "সফ্টওয়্যার আপডেট" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "আপগ্রেড (_p)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "পরীক্ষা করো (_C)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "পুনরায় আপগ্রেড শুরু (_R)" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "ভবিষ্যতে এই তথ্য আড়াল রাখো (_H)" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "পরিবর্তন" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1102,76 +1099,81 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "সিডিরম যোগ (_C)" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "প্রমাণীকরন" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "ডাউনলোড করা সফ্টওয়্যার ফাইল মুছো (_e):" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "ডাউনলোড সম্পন্ন" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "বিশ্বস্ত সফ্টওয়্যার প্রদানকারীর থেকে পাবলিক কী ইমপোর্ট করো" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "ইন্টারনেট আপডেট" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "ডিফল্ট পুনঃস্হাপন (_D)" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "আপনার ডিস্ট্রিবিউশনের ডিফল্ট কী পুনঃস্হাপন করুন" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "সফ্টওয়্যার বৈশিষ্ট্য" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "স্বয়ংক্রিয় ভাবে আপডেট পরীক্ষা করো (_C):" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "আড়ালে আপডেট ডাউনলোড করো, কিন্তু তাদেরকে ইন্সটল করো না (_D)" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "কী ফাইল ইম্পোর্ট(_ই)" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "নিরাপত্তা জনিত আপডেট গুলো অনুমদন ছাড়াই ইন্সটল করো (_I)" @@ -1537,6 +1539,13 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "আপডেট ইন্সটল করো (_I)" + +#~ msgid "Cancel _Download" +#~ msgstr "ডাউনলোড বাতিল (_D)" + #~ msgid "Some software no longer officially supported" #~ msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" @@ -1604,9 +1613,6 @@ msgstr "" #~ msgid "<b>Keys</b>" #~ msgstr "<b>কী</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "সিডিরম যোগ (_C)" - #~ msgid "Installation Media" #~ msgstr "ইন্সটলেশন মাধ্যম" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse <oublieuse@gmail.com>\n" "Language-Team: Breton <br@li.org>\n" @@ -88,49 +88,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Emborzhiañ an alc'hwezh" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Fazi en ur emborzhiañ ar restr dibabet" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Fazi en ur zilemel an alc'hwezh" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -138,11 +138,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Roit un anv evit ar bladenn marplij" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Lakait ur bladenn e-barzh ul lenner marplij:" @@ -156,20 +156,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -178,34 +178,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +232,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -274,42 +274,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -318,15 +318,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -335,77 +335,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -415,19 +415,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -548,7 +548,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -772,14 +772,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -816,7 +816,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -830,114 +830,114 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -953,34 +953,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -988,49 +984,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1062,74 +1058,78 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "Emborzhiañ an alc'hwezh" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n" "Language-Team: Catalan <tradgnome@softcatala.org>\n" @@ -87,52 +87,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Actualitzacions de programari" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Font" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Font" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importa un clau" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "S'ha produït un error en importar el fitxer seleccionat" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "S'ha produït un error en esborrar la clau" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -143,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Introduïu un nom per al disc" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Inseriu un disc a la unitat:" @@ -163,21 +163,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:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 #, fuzzy msgid "Can't upgrade required meta-packages" msgstr "No s'han pogut actualitzar els metapaquets sol·licitats" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -189,11 +189,11 @@ msgstr "" "de l'error. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -203,12 +203,12 @@ msgstr "" "amb la xarxa. Podeu provar-ho després. A continuació es mostra la llista amb " "els paquets no autenticats." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "No s'ha pogut instal·lar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,11 +217,11 @@ msgstr "" "els error. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -255,11 +255,11 @@ msgstr "" msgid "Reading cache" msgstr "S'està llegint la memòria cau" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -267,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "No s'ha trobat una rèplica vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -284,11 +284,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -297,11 +297,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "La informació del dipòsit no és vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -309,11 +309,11 @@ msgstr "" "En actualitzar la informació del dipòsit s'ha produït un error. Informeu de " "l'error." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "S'han desactivat les fonts de tercers" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -324,11 +324,11 @@ msgstr "" "reactivar-los, després de l'actualització de programari, des de 'propietats " "del programari' o des del Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "S'ha produït un error en l'actualització" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "No disposeu de suficient espai al disc" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -353,15 +353,15 @@ msgstr "" "apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Voleu iniciar l'actualització?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "No s'han pogut instal·lar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -373,11 +373,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:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "No s'han pogut descarregar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -385,17 +385,17 @@ 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:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Aquests paquets instal·lats ja no es mantindran de manera oficial i només " @@ -403,54 +403,54 @@ msgstr "" "\n" "Si no teniu activat 'universe' se us sugerirà que els desintal·leu. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Voleu esborrar els paquets obsolets?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Omet aquest pas" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "Esbo_rra" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "S'està restaurant l'estat original del sistema" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "S'està comprovant el gestor de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "S'està actualitzant la informació del dipòsit" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "La informació del paquet no és valida" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -460,19 +460,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Actualitzant" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "S'està cercant programari obsolet" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "S'ha completat l'actualització del sistema" @@ -601,7 +601,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "El vostre sistema està actualitzat" @@ -833,15 +833,15 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "S'està descarregant el fitxer %li de %li amb %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "S'està descarregant el fitxer %li de %li amb %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -883,8 +883,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Instal·la les actualitzacions" +msgid "Distribution updates" +msgstr "_Reprén l'actualització" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -898,87 +898,66 @@ msgid "Version %s: \n" msgstr "Versió %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Comprova" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Mida de la descàrrega: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Espereu, això pot tardar una estona." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "S'estan comprovant les actualitzacions..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Versió nova: %s (Mida: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versió %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "La vostra distribució ja no es mantindrà més" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -988,17 +967,17 @@ msgstr "" "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més " "informació." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Ja disposeu de la nova distribució '%s'</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "L'índex de programari s'ha trencat" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1008,12 +987,35 @@ msgstr "" "utilitzeu el gestor de paquets \"Synaptic\" o executeu \"sudo apt-get " "install -f\" en un terminal." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Heu de comprovar les actualizacions manualment</big></b>\n" "\n" @@ -1039,34 +1041,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Voleu iniciar l'actualització?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Cancel·la la _descàrrega" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Canvis" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Compro_va" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Comprova els canals de programari per a actualitzacions noves" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Descripció" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Notes de la versió" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1074,15 +1072,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Mostra el progrés per als fitxers individuals" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Actualitzacions de programari" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1090,37 +1088,37 @@ msgstr "" "Les actualitzacions de programari corregeixen errors, eliminen problemes de " "seguretat i proporcionen prestacions noves." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Actualitza" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualitza a la darrera versió d'Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Comprova" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Reprén l'actualització" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_En el futur oculta aquesta informació" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Instal·la les actualitzacions" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Canvis" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1154,77 +1152,82 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Afegeix un _CD-ROM" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autenticació" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "Esborra els fitxers de programari descarregats:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "S'ha completat la descàrrega" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importa la clau pública d'un proveïdor de confiança" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Actualitzacions d'Internet" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Restaura els valors per _defecte" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Restaura les claus per defecte de la vostra distribució" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Propietats del programari" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Font" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Comprova les actualitzacions automàticament" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Descarrega les actualitzacions en segon pla, però no les instal·lis" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Importa una clau" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Instal·la actualitzacions de seguretat sense confirmació" @@ -1613,6 +1616,17 @@ msgstr "Programari compatible DFSG amb dependències no lliures" msgid "Non-DFSG-compatible Software" msgstr "Programari no compatible DFSG" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "" +#~ "S'està descarregant el fitxer %li de %li a una velocitat desconeguda" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Instal·la les actualitzacions" + +#~ msgid "Cancel _Download" +#~ msgstr "Cancel·la la _descàrrega" + #~ msgid "Some software no longer officially supported" #~ msgstr "Algun programari ja no es mantindrà oficialment" @@ -1701,9 +1715,6 @@ msgstr "Programari no compatible DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Claus</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Afegeix un _CD-ROM" - #~ msgid "Installation Media" #~ msgstr "Mitjà d'instal·lació" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála <tomas@monty.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -89,46 +89,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Aktualizace softwaru" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importovat klíč" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Chyba při importování vybraného souboru" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Chyba při odstraňování klíče" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Prosím zadejte jméno disku" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Prosím vložte disk do mechaniky:" @@ -159,20 +159,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:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Nemohu aktualizovat požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Nemohu vypočítat aktualizaci" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -184,11 +184,11 @@ msgstr "" "chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Chyba při ověření některých balíků" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 "" "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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Nemohu nainstalovat '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,11 +211,11 @@ msgstr "" "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Nemohu odhadnout meta-balík" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -248,11 +248,11 @@ msgstr "" msgid "Reading cache" msgstr "Probíhá čtení cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Nenalezeno správné zrcadlo" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -277,11 +277,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Vytvořit standardní zdroje?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -290,11 +290,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Neplatná informace zdroje" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -302,22 +302,22 @@ msgstr "" "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako " "chybu." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Zdroje třetích stran vypnuté" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Chyba během aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -325,11 +325,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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Nedostatek volného místa na disku" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -338,15 +338,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Chcete spustit aktualizaci?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Nelze nainstalovat aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -359,11 +359,11 @@ msgstr "" "stavu. Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo " "Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Nelze stáhnout aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -371,36 +371,36 @@ 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:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Odebrat zastaralé balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Přeskočit tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Odebrat" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Chyba při zaznamenávání" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -409,31 +409,31 @@ msgstr "" "prohléhněte níže uvedenou zprávu. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Obnovuje se původní stav systému" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Kontroluje se manažer balíků" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Aktualizují se informace o úložišti" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -443,19 +443,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Požaduje se potvrzení" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Probíhá upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Vyhledáván zastaralý software" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Upgrade systému je dokončen." @@ -588,7 +588,7 @@ msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty." #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Váš systém je aktuální" @@ -828,15 +828,15 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Stahuji %li. soubor z %li rychlostí %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Stahuji %li. soubor z %li neznámou rychlostí" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Stahuji %li. soubor z %li rychlostí %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -877,8 +877,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Instaluji aktualizace" +msgid "Distribution updates" +msgstr "_Pokračovat v upgradu" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -892,47 +892,26 @@ msgid "Version %s: \n" msgstr "Verze %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Stahuji seznam změn ..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Zkontrolovat" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Stahovaná velikost: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -940,40 +919,40 @@ msgstr[0] "Můžete instalovat %s aktualizaci" msgstr[1] "Můžete instalovat %s aktualizace" msgstr[2] "Můžete instalovat %s aktualizací" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Prosím čekejte, může to nějakou dobu trvat." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Aktualizace je dokončena" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Zkontrolovat dostupné aktualizace" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nová verze: %s (Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Verze %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Vaše distribude už není podporovaná" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -983,29 +962,52 @@ 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Musíte zkontrolovat aktualizace manuálně</big></b>\n" "\n" @@ -1030,34 +1032,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Spustit upgrade?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Přerušit _stahování" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Změny" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Z_kontrolovat" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Zkontrolovat dostupnost nových aktualizací v distribučních kanálech" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Popis" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Poznámky k vydáni" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1065,15 +1063,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Zobrazit průběh stahování jednotlivých souborů" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Aktualizace softwaru" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1081,37 +1079,37 @@ msgstr "" "Aktualizace softwaru opravuje chyby, eliminuje bezpečnostní zranitelnosti a " "poskytují nové vlastnosti." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgradovat na poslední verzi Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Zkontrolovat" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Pokračovat v upgradu" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Nezobrazovat příště tyto informace" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "Na_instalovat Aktualizace" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Změny" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1145,27 +1143,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Přidat _Cdrom" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Ověření" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Smazat stažené soubory programů:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Stahování bylo dokončeno" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importovat veřejný klíč od důvěryhodného poskytovate softwaru" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Síťové aktualizace" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1173,51 +1176,51 @@ msgstr "" "Automaticky instalovány budou pouze bezpečností aktualizace z oficiálních " "serverů Ubuntu." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Obnovit _Původní" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Obnovit původní klíče vaší distribuce" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Vlastnosti softwaru" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Zkontrolovat aktualizace automaticky" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Stáhnout aktualizace na pozadí, ale neinstalovat je." -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "Importovat klíč" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Instalovat bezpečnostní aktualizace bez potvrzení" @@ -1605,6 +1608,16 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Žádný DFSG kompatibilní Software" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Stahuji %li. soubor z %li neznámou rychlostí" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Instaluji aktualizace" + +#~ msgid "Cancel _Download" +#~ msgstr "Přerušit _stahování" + #~ msgid "Could not find any upgrades" #~ msgstr "Žádné upgrady nebyly nalezeny." @@ -1679,9 +1692,6 @@ msgstr "Žádný DFSG kompatibilní Software" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Klíče</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Přidat _Cdrom" - #~ msgid "Installation Media" #~ msgstr "Instalační Medium" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K <mathias@computergeil.dk>\n" "Language-Team: Danish <da@li.org>\n" @@ -88,47 +88,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Opdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importér nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Fejl under importering af den valgte fil" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Fejl ved fjernelse af nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Indtast venligst et navn til disken" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Indsæt venligst en disk i drevet:" @@ -159,22 +159,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:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke opgradere de krævede meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 #, 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 #, fuzzy msgid "Could not calculate the upgrade" msgstr "Kunne ikke udregne opgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -186,11 +186,11 @@ msgstr "" "Rapportér venligst dette som en fejl. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Fejl ved godkendelse af nogle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -200,12 +200,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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,12 +214,12 @@ msgstr "" "som en fejl. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 #, fuzzy msgid "Can't guess meta-package" msgstr "Kan ikke gætte meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -253,11 +253,11 @@ msgstr "" msgid "Reading cache" msgstr "Læser cache-mellemlager" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -265,11 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -282,11 +282,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,11 +295,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Arkivinformation ugyldig." -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -307,22 +307,22 @@ msgstr "" "Opgradering af arkivet resulterede i en ødelagt fil. raporter venligst dette " "som en fejl." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Trediepartskilder er fravalgt" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Fejl under opdatering" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -330,11 +330,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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Der er ikke nok fri diskplads" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -346,15 +346,15 @@ msgstr "" "køre 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Vil du starte opgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Kunne ikke installere opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -366,11 +366,11 @@ msgstr "" "Upgraderingen afbrydes nu. Dit system kan forekomme ustabilt. En oprydning " "blev foretaget (dpkg --configura -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Kunne ikke hente opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -378,17 +378,17 @@ msgstr "" "Opgraderingen afbryder nu. Tjek venligst din internetforbindelse eller dit " "installationsmedie og prøv igen. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Disse installerede pakker er ikke længere officielt understøttet, og er nu " @@ -397,25 +397,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:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Fjern forældede pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 #, fuzzy msgid "_Skip This Step" msgstr "_Spring dette trin over" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 #, fuzzy msgid "Error during commit" msgstr "Fejl under udførsel" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -424,31 +424,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Genstarter oprindelig systemtilstand" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Undersøger pakkehåndtering" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Opdaterer arkivinformation" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -458,19 +458,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Opgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Søger efter forældet software" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Systemopgradering er fuldført" @@ -600,7 +600,7 @@ msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data." #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Dit system er opdateret" @@ -842,15 +842,15 @@ msgstr "" "Godkendelse af opgraderingen fejlede. Der er muligvis et problem med " "netværket eller med serveren. " -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, fuzzy, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Henter fil %li af %li med %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Henter fil %li af %li med ukendt hastighed" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Henter fil %li af %li med %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -893,8 +893,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Installer Opdateringer" +msgid "Distribution updates" +msgstr "_Genoptag opgradering" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -908,87 +908,66 @@ msgid "Version %s: \n" msgstr "Version %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Henter listen med ændringer..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Tjek" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Overføringsstørelse: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Vent venligst, dette kan tage et stykke tid." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Opdatering udført" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_Installer Opdateringer" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Ny version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Din distribution understøtes ikke længere" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -998,17 +977,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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Software indexet er i stykker" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1018,13 +997,35 @@ msgstr "" "pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo apt-get install -f" "\" i en terminal for at ordne dette problem først." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 #, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Du må undersøge for opdateringer manuelt</big></b>\n" "\n" @@ -1050,38 +1051,33 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Start opgraderinegn?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -#, fuzzy -msgid "Cancel _Download" -msgstr "Afbryd _Hentning" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Ændringer" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 #, fuzzy msgid "Chec_k" msgstr "_Tjek" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 #, fuzzy msgid "Check the software channels for new updates" msgstr "Undersøg softwarekanalerne for nye opdateringer" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 #, fuzzy msgid "Release Notes" msgstr "Udgivelsesnoter" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1089,15 +1085,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Vis fremgang for enkelte filer" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Opdateringer" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1105,37 +1101,37 @@ msgstr "" "Softwareopdateringer retter fejl, lukker sikkerhedshuller og gør nye " "funktioner tilgængelige." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Opgrader" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Opgrader til seneste version af Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Tjek" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Genoptag opgradering" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Skjul denne information for fremtiden" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Installer Opdateringer" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Ændringer" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1169,29 +1165,34 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Tilføj _CD-ROM" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Godkendelse" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 #, fuzzy msgid "D_elete downloaded software files:" msgstr "_Slet overførte softwarefiler:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Overførsel fuldført" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Importer den offentlige nøgle fra en betroet softwareleverandør" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internetopdateringer" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1199,51 +1200,51 @@ msgstr "" "Kun sikkerhedsopdateringer fra de officielle Ubuntu-servere vil blive " "installeret automatisk." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Gendan _standard" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Gendan standardnøglerne for din distribution" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Softwareinstillinger" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Kontroller automatisk om der er nye opdateringer" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Hent opdateringer i baggrunden, men installer dem ikke" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "Importér nøgle" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Installer sikkerhedsopdateringer automatisk uden bekræftelse" @@ -1637,6 +1638,17 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Henter fil %li af %li med ukendt hastighed" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Installer Opdateringer" + +#, fuzzy +#~ msgid "Cancel _Download" +#~ msgstr "Afbryd _Hentning" + #~ msgid "Some software no longer officially supported" #~ msgstr "Noget software er ikke længere officielt understøttet" @@ -1715,10 +1727,6 @@ msgstr "" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Nøgler</b>" -#, fuzzy -#~ msgid "Add _Cdrom" -#~ msgstr "Tilføj _CD-ROM" - #~ msgid "Installation Media" #~ msgstr "Installationsmedie" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein <glatzor@gmx.de>\n" "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n" @@ -89,52 +89,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Software-Aktualisierungen" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Quellen" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Quellen" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Schlüssel importieren" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -145,11 +145,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Geben Sie einen Namen für das Medium ein" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie ein Medium in das Laufwerk:" @@ -166,20 +166,20 @@ msgstr "" "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor " "Sie fortfahren." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Die Aktualisierung konnte nicht berechnet werden" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -191,11 +191,11 @@ msgstr "" "erstellen Sie hierfür einen Fehlerbericht. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -206,12 +206,12 @@ msgstr "" "später noch einmal. Die unten stehenden Pakete konnten nicht auf ihre " "Echtheit hin bestätigt werden:" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "›%s‹ kann nicht installiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -220,11 +220,11 @@ msgstr "" "Sie hierfür einen Fehlerbericht. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Metapaket konnte nicht bestimmt werden" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -258,11 +258,11 @@ msgstr "" msgid "Reading cache" msgstr "Zwischenspeicher wird ausgelesen" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -270,11 +270,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Kein gültiger Mirror gefunden" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -294,11 +294,11 @@ msgstr "" "Wenn Sie 'Nein' wählen, wird das Update abgebrochen." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Standardquellen generieren?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -312,11 +312,11 @@ msgstr "" "Sollen Standardeinträge für '%s' hinzugefügt werden? Wenn Sie 'Nein' " "auswählen, wird das Update abgebrochen." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Ungültige Kanalinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -324,11 +324,11 @@ msgstr "" "Die Aktualisierung der Quellen-Information ergab eine ungültige Datei. Bitte " "erstellen Sie einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Quellen von Drittanbietern deaktiviert" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -339,11 +339,11 @@ msgstr "" "Sie können diese nach dem Upgrade mit dem 'software-properties'-Werkzeug " "oder mit Synaptic reaktivieren." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Fehler während der Aktualisierung" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -352,11 +352,11 @@ msgstr "" "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre " "Netzwerkverbindung und versuchen Sie es noch einmal." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Unzureichender freier Festplattenspeicher" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -368,15 +368,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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Möchten Sie die Aktualisierung starten?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Die Aktualisierungen konnten nicht installiert werden" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -389,11 +389,11 @@ msgstr "" "unbenutzbaren Zustand befinden. Eine Wiederherstellung wurde durchgeführt " "(dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -402,17 +402,17 @@ msgstr "" "Internet-Verbindung oder Ihr Installationsmedium und versuchen Sie es noch " "einmal. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Die installierten Pakete werden nicht mehr länger offiziell unterstützt und " @@ -421,23 +421,23 @@ msgstr "" "Wenn sie 'universe' nicht aktiviert haben, werden diese Pakete im nächsten " "Schritt zum Entfernen vorgeschlagen. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Veraltete Pakete entfernen?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "Ü_berspringen" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Entfernen" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Fehler beim Anwenden" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -446,31 +446,31 @@ msgstr "" "Nachricht für nähere Informationen. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Wiederherstellen des alten Systemzustandes" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Paketverwaltung wird überprüft" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Aktualisiere Quellen-Information" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Ungültige Paketinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -484,19 +484,19 @@ msgstr "" "Dies deutet auf einen gravierenden Fehler hin, bitte erstellen Sie hierfür " "einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Nach Bestätigung fragen" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Aktualisiere" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Nach veralteter Software wird gesucht" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Aktualisierung ist abgeschlossen." @@ -631,7 +631,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Ihr System ist auf dem aktuellen Stand" @@ -876,15 +876,15 @@ msgstr "" "Die Echtheitsbestätigung der Aktualisierung ist fehlgeschlagen. " "Möglicherweise gibt es Probleme im Netzwerk oder am Server. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Datei %li von %li wird mit %s/s heruntergeladen" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Datei %li von %li wird mit %s/s heruntergeladen" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -930,8 +930,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Aktualisierungen werden installiert" +msgid "Distribution updates" +msgstr "_Aktualisierung fortsetzen" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -945,87 +945,66 @@ msgid "Version %s: \n" msgstr "Version %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Liste mit Änderungen wird heruntergeladen..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Prüfen" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Download-Größe: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Aktualisierung ist abgeschlossen" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Nach verfügbaren Aktualisierungen suchen" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Neue Version: %s (Größe: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Ihre Distribution wird nicht länger unterstützt" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1036,17 +1015,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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Neue Version '%s' der Distribution ist freigegeben</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Der Software-Index ist beschädigt" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1056,12 +1035,35 @@ msgstr "" "verwenden Sie zuerst die Synaptic Paketverwaltung oder führen Sie »sudo apt-" "get install -f« im Terminal aus, um dieses Problem zu beheben." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Sie müssen manuell auf Aktualisierungen prüfen</big></b>\n" "\n" @@ -1087,34 +1089,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Mit der Aktualisierung beginnen?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "_Herunterladen abbrechen" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Änderungen" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Prüfen" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Software-Kanäle auf Aktualisierungen prüfen" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Beschreibung" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Freigabemitteilung" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1122,15 +1120,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Fortschritt der einzelnen Dateien anzeigen" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Software-Aktualisierungen" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1138,37 +1136,37 @@ msgstr "" "Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " "stellen neue Funktionen bereit." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Aktualisieren" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aus die neueste Version von Ubuntu aktualisieren" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Prüfen" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Aktualisierung fortsetzen" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "Diese Information in Zukunft _nicht mehr anzeigen" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "Aktualisierungen _installieren" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Änderungen" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1202,29 +1200,34 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "CD-Rom _hinzufügen" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Echtheitsbestätigung" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "Heruntergeladene Paketdateien _löschen:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Herunterladen abgeschlossen" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "" "Den öffentlichen Schlüssel eines vertrauenswürdigen Software-Anbieters " "importieren" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internet-Aktualisierungen" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1232,52 +1235,52 @@ msgstr "" "Nur Sicherheitsaktualisierungen von den offiziellen Ubuntu-Servern werden " "automatisch installiert" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "_Vorgabeschlüssel wiederherstellen" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Die Vorgabeschlüssel Ihrer Distribution wiederherstellen" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Software-Eigenschaften" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Quellen" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Automatisch auf Aktualisierungen prüfen:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "" "Aktualisierungen im _Hintergrund herunterladen, aber nicht installieren" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "Schlüsseldatei _importieren" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "Sicherheitsaktualisierungen _ohne Bestätigung installieren" @@ -1671,6 +1674,17 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "" +#~ "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Aktualisierungen werden installiert" + +#~ msgid "Cancel _Download" +#~ msgstr "_Herunterladen abbrechen" + #~ msgid "Some software no longer officially supported" #~ msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" @@ -1762,9 +1776,6 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Schlüssel</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "CD-Rom _hinzufügen" - #~ msgid "Installation Media" #~ msgstr "Installationsmedien" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n" "Language-Team: Greek <team@gnome.gr>\n" @@ -87,49 +87,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "Κανάλι λογισμικού" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "Ενεργό" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Εισαγωγή κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να " "είναι κατεστραμμένο." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Σφάλμα απομάκρυνσης του κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως " "σφάλμα." -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -140,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:" @@ -161,20 +161,20 @@ msgstr "" "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή apt-" "get για να συνεχίσετε." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -186,11 +186,11 @@ msgstr "" "Παρακαλώ αναφέρετε το ως σφάλμα. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -200,12 +200,12 @@ msgstr "" "σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα των " "μη πιστοποιημένων πακέτων." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,11 +214,11 @@ msgstr "" "ως σφάλμα. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -252,11 +252,11 @@ msgstr "" msgid "Reading cache" msgstr "Ανάγνωση λανθάνουσας μνήμης" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -264,11 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -289,11 +289,11 @@ msgstr "" " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Δημιουργία προεπιλεγμένων πηγών;" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -307,11 +307,11 @@ msgstr "" "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε " "'Όχι' η ενημέρωση θα ακυρωθεί." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Μη έγκυρες πληροφορίες repository" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -319,11 +319,11 @@ msgstr "" "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο " "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Απενεργοποιήθηκαν πηγές τρίτων" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -334,11 +334,11 @@ msgstr "" "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-" "properties' ή με το synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Σφάλμα κατά την ενημέρωση" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -346,11 +346,11 @@ msgstr "" "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει " "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -362,15 +362,15 @@ msgstr "" "προηγούμενων εγκαταστάσεων με την εντολή 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -382,11 +382,11 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. " "Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Αδυναμία λήψης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -394,17 +394,17 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Αυτά τα εγκατεστημένα πακέτα δεν υποστηρίζονται πια επίσημα, και τώρα " @@ -413,23 +413,23 @@ msgstr "" "Αν δεν έχετε ενεργοποιημένο το 'universe' , θα γίνει πρόταση για απομάκρυνση " "αυτών των πακέτων στο επόμενο βήμα. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Αφαίρεση παρωχημένων πακέτων;" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "Παράκα_μψη αυτου του βήματος" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Απομάκρυνση" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Σφάλμα κατά την υποβολή" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -438,31 +438,31 @@ msgstr "" "παρακάτω μήνυμα για περισσότερες πληροφορίες. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Έλεγχος διαχειριστή πακέτων" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Ενημέρωση πληροφοριών repository" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Μη έγκυρες πληροφορίες πακέτου" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -475,19 +475,19 @@ msgstr "" "απαραίτητο πακέτο '%s'.\n" " Αυτό σημαίνει ότι πρόκειται για σημαντικό σφάλμα, παρακαλώ αναφέρετε το." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Ερώτηση για επιβεβαίωση" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Γίνεται αναβάθμιση" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε." @@ -622,7 +622,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Το σύστημα σας είναι ενημερωμένο" @@ -863,15 +863,15 @@ msgstr "" "Η πιστοποίηση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή " "εξυπηρετητή. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Λήψη αρχείου %li από %li με %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Λήψη αρχείου %li από %li με %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -915,8 +915,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Εγκατάσταση ενημερώσεων" +msgid "Distribution updates" +msgstr "_Συνέχεια αναβάθμισης" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -930,87 +930,66 @@ msgid "Version %s: \n" msgstr "Έκδοση%s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Λήψη της λίστας των αλλαγών..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "Έλε_γχος" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Μέγεθος λήψης: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση" msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Η ενημέρωση ολοκληρώθηκε" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Έλεγχος για διαθέσιμες ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Νέα έκδοση: %s (Μέγεθος: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Έκδοση%s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Η διανομή σας δεν υποστηρίζεται πια" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1021,17 +1000,17 @@ msgstr "" "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες " "για την αναβάθμιση." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Είναι διαθέσιμη νέα έκδοση διανομής '%s'</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1041,12 +1020,35 @@ msgstr "" "το διαχειριστή πακέτων \"Synaptic\" η εκτελέστε την εντολή \"sudo apt-get " "install -f\" σε ένα τερματικό για να διορθώσετε το πρόβλημα πρώτα." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Θα πρέπει να κάνετε έλεγχο για ενημερώσεις χειροκίνητα</big></b>\n" "\n" @@ -1072,34 +1074,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Έναρξη της αναβάθμισης;</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Ακύρωση _λήψης αρχείων" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Αλλαγές" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Ελε_γχος" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Έλεγχος των καναλιών λογισμικού για ενημερώσεις" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Περιγραφή" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Σημειώσεις έκδοσης" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1107,15 +1105,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Εμφάνιση προόδου μοναδικών αρχείων" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Αναβαθμίσεις λογισμικού" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1123,37 +1121,37 @@ msgstr "" "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " "να παρέχουν νέες λειτουργίες." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "Ανα_βάθμιση" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "Έλε_γχος" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Συνέχεια αναβάθμισης" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "Απόκρυ_ψη αυτής της πληροφορίας στο μέλλον" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "Ε_γκατάσταση ενημερώσεων" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Αλλαγές" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1187,27 +1185,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Προσθήκη _Cdrom" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Πιστοποίηση" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "Δια_γραφή αρχείων ληφθέντων πακέτων" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Η λήψη ολοκληρώθηκε" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Εισαγωγή του δημόσιου κλειδιού από έναν έμπιστο πάροχο λογισμικού" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Αναβαθμίσεις διαδικτύου" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1215,50 +1218,50 @@ msgstr "" "Μόνο οι ενημερώσεις ασφαλείας που προέρχονται από τους επίσημους " "εξυπηρετητές του Ubuntu θα εγκαθίστανται αυτόματα." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Επαναφορά π_ροεπιλογών" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Επαναφορά των προεπιλεγμένων κλειδιών της διανομής σας" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Ιδιότητες λογισμικού" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "Αυτόματος έλεγ_χος για ενημερώσεις κάθε:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "Λή_ψη ενημερώσεων στο παρασκήνιο χωρίς να εγκατασταθούν" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "Ε_ισαγωγή αρχείου κλειδιού" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "Ε_γκατάσταση ενημερώσεων ασφαλείας χωρίς επιβεβαίωση" @@ -1649,6 +1652,16 @@ msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Εγκατάσταση ενημερώσεων" + +#~ msgid "Cancel _Download" +#~ msgstr "Ακύρωση _λήψης αρχείων" + #~ msgid "Some software no longer officially supported" #~ msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" @@ -1736,9 +1749,6 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Κλειδιά</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Προσθήκη _Cdrom" - #~ msgid "Installation Media" #~ msgstr "Μέσα εγκατάστασης" diff --git a/po/en_AU.po b/po/en_AU.po index 54dd3f08..efcc4b91 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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons <david.symons@liberatedcomputing.net>\n" "Language-Team: English (Australia) <en_AU@li.org>\n" @@ -88,47 +88,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Import key" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Please enter a name for the disc" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Please insert a disc in the drive:" @@ -159,20 +159,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:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Can't upgrade required meta-packages" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -184,11 +184,11 @@ msgstr "" "this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 "" "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,11 +212,11 @@ msgstr "" "bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Can't guess meta-packag" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -250,11 +250,11 @@ msgstr "" msgid "Reading cache" msgstr "Reading cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -262,11 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +286,11 @@ msgstr "" "If you select 'no' the update will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +303,11 @@ msgstr "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,11 +315,11 @@ msgstr "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -330,11 +330,11 @@ msgstr "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Error during update" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Not enough free disk space" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -358,15 +358,15 @@ msgstr "" "'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Could not install the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -378,11 +378,11 @@ msgstr "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Could not download the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -390,17 +390,17 @@ msgstr "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "These installed packages are no longer officially supported, and are now " @@ -409,23 +409,23 @@ msgstr "" "If you don't have 'universe' enabled these packages will be suggested for " "removal in the next step. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Remove obsolete packages?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Skip This Step" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Remove" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Error during commit" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,31 +434,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Restoring original system state" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Checking package manager" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Updating repository information" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -471,19 +471,19 @@ msgstr "" "not be found anymore.\n" "This indicates a serious error, please report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Asking for confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Upgrading" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Searching for obsolete software" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "System upgrade is complete." @@ -615,7 +615,7 @@ msgstr "To prevent data loss close all open applications and documents." #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Your system is up-to-date" @@ -854,15 +854,15 @@ msgstr "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Downloading file %li of %li with %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Downloading file %li of %li with unknown speed" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Downloading file %li of %li with %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -904,8 +904,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Install Updates" +msgid "Distribution updates" +msgstr "_Resume Upgrade" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -919,87 +919,66 @@ msgid "Version %s: \n" msgstr "Version %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Downloading the list of changes..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Check" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Download size: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_Install Updates" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "New version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Your distribution is not supported anymore" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1009,17 +988,17 @@ msgstr "" "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>New distribution release '%s' is available</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1029,12 +1008,35 @@ msgstr "" "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -1060,34 +1062,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Start the upgrade?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Cancel _Download" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Chec_k" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Check the software channels for new updates" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Release Notes" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1095,15 +1093,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Show progress of single files" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1111,37 +1109,37 @@ msgstr "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade to the latest version of Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Check" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Resume Upgrade" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Hide this information in the future" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Install Updates" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1175,27 +1173,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Add _Cdrom" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Authentication" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "D_elete downloaded software files:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Download is complete" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Import the public key from a trusted software provider" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internet Updates" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1203,50 +1206,50 @@ msgstr "" "Only security updates from the official Ubuntu servers will be installed " "automatically" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Restore _Defaults" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Restore the default keys of your distribution" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Software Properties" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Check for updates automatically:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Download updates in the background, but do not install them" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Import Key File" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Install security updates without confirmation" @@ -1639,6 +1642,16 @@ msgstr "DFSG-compatible Software with Non-Free Dependencies" msgid "Non-DFSG-compatible Software" msgstr "Non-DFSG-compatible Software" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Downloading file %li of %li with unknown speed" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Install Updates" + +#~ msgid "Cancel _Download" +#~ msgstr "Cancel _Download" + #~ msgid "Some software no longer officially supported" #~ msgstr "Some software no longer officially supported" @@ -1726,9 +1739,6 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Keys</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Add _Cdrom" - #~ msgid "Installation Media" #~ msgstr "Installation Media" diff --git a/po/en_CA.po b/po/en_CA.po index b7a59cf9..86bc663c 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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: Canadian English <adamw@gnome.org>\n" @@ -89,49 +89,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -157,20 +157,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -181,23 +181,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:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -206,11 +206,11 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +237,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -249,11 +249,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -266,11 +266,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -279,43 +279,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -324,15 +324,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -341,78 +341,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -422,20 +422,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -557,7 +557,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" @@ -789,14 +789,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -840,8 +840,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Install" +msgid "Distribution updates" +msgstr "Upgrade finished" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -856,116 +856,116 @@ msgstr "Version %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Cancel downloading the ChangeLog" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_Install" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -981,34 +981,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1016,53 +1012,53 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "U_pgrade" msgstr "Upgrade finished" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "Upgrade finished" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "_Install" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1098,78 +1094,83 @@ msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 #, fuzzy +msgid "Add Cdrom" +msgstr "Add _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 +#, fuzzy msgid "Authentication" msgstr "A_uthentication" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Download from:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Remove the selected key from the trusted keyring." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>Internet Updates</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Restore default keys" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Software Properties" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Source" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1556,6 +1557,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Install" + +#, fuzzy #~ msgid "Your system has already been upgraded." #~ msgstr "Your system has broken packages!" @@ -1589,10 +1594,6 @@ msgstr "" #~ msgstr "<b>Details</b>" #, fuzzy -#~ msgid "Add _Cdrom" -#~ msgstr "Add _CD" - -#, fuzzy #~ msgid "Installation Media" #~ msgstr "Installing updates..." diff --git a/po/en_GB.po b/po/en_GB.po index 71e7ac0c..809ea292 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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n" "Language-Team: \n" @@ -88,49 +88,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -138,11 +138,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -156,20 +156,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -180,23 +180,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:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -205,11 +205,11 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +236,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -265,11 +265,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -278,43 +278,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -323,15 +323,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -340,78 +340,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -421,21 +421,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 #, fuzzy msgid "Asking for confirmation" msgstr "Checking system configuration" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -557,7 +557,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" @@ -788,14 +788,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -839,7 +839,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "Installing updates..." #. TRANSLATORS: updates from an 'unknown' origin @@ -855,116 +855,116 @@ msgstr "Version %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Downloading Changes" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Installing updates..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -980,34 +980,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1015,51 +1011,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "Installing updates..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1095,80 +1091,85 @@ msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 #, fuzzy +msgid "Add Cdrom" +msgstr "Add _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 +#, fuzzy msgid "Authentication" msgstr "A_uthentication" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Download from:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Remove the selected key from the trusted keyring." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>Internet Updates</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Restore default keys" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Restore default keys" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Software Properties" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Source" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "Installing updates..." -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1556,6 +1557,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Installing updates..." + +#, fuzzy #~ msgid "Your system has already been upgraded." #~ msgstr "Your system has broken packages!" @@ -1589,10 +1594,6 @@ msgstr "" #~ msgstr "<b>Details</b>" #, fuzzy -#~ msgid "Add _Cdrom" -#~ msgstr "Add _CD" - -#, fuzzy #~ msgid "Installation Media" #~ msgstr "Installing updates..." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n" "Language-Team: Spanish <traductores@gnome.org>\n" @@ -90,52 +90,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Actualizaciones de software" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Fuente" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Fuente" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importar clave" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Hubo un error al importar el archivo seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -146,11 +146,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Por favor, introduzca un nombre para el disco" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Por favor, inserte un disco en la unidad:" @@ -167,20 +167,20 @@ msgstr "" "software. Por favor, arréglelos primero usando Synaptic o apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "No se han podido actualizar los meta-paquetes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -192,11 +192,11 @@ msgstr "" "actualización. Por favor, informe de ésto como un fallo. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Error autenticando algunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -206,12 +206,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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -220,11 +220,11 @@ msgstr "" "como un fallo. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "No se ha podido determinar el meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -258,11 +258,11 @@ msgstr "" msgid "Reading cache" msgstr "Leyendo caché" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -270,11 +270,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "No se ha encontrado un servidor espejo válido" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -295,11 +295,11 @@ msgstr "" "Si selecciona «No» se cancelará la actualización." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "¿Generar orígenes predeterminados?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -313,11 +313,11 @@ msgstr "" "¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se " "cancelará la actualización." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Información de repositorio no válida" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -325,11 +325,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:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Orígenes de terceros desactivados" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -340,11 +340,11 @@ msgstr "" "volver a activarlas tras la actualización con la herramienta «Propiedades " "del software», o con Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Error durante la actualización" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -353,11 +353,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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "No hay espacio suficiente en el disco" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -369,15 +369,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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "¿Desea comenzar la actualización?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "No se han podido instalar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -390,11 +390,11 @@ msgstr "" "estado inutilizable. Se está llevando a cabo una recuperación (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "No se han podido descargar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -402,17 +402,17 @@ 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:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Estos paquetes instalados ya no están soportados oficialmente, y desde ahora " @@ -421,23 +421,23 @@ msgstr "" "Si no tiene activado el «universe», se le sugerirá que desinstale estos " "paquetes en el siguiente paso. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "¿Desinstalar los paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Saltar este paso" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Quitar" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Error durante la confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -446,31 +446,31 @@ msgstr "" "inferior para más información. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Restaurando el estado original del sistema" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Comprobando gestor de paquetes" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Actualizando la información del repositorio" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Información de paquete no válida" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -483,19 +483,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:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Solicitando confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Actualizando" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Buscando paquetes obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "La actualización del sistema se ha completado." @@ -630,7 +630,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Su sistema está actualizado" @@ -874,15 +874,15 @@ msgstr "" "Ha fallado la autenticación de la actualización. Debe haber un problema con " "la red o el servidor. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Descargando archivo %li de %li a %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Descargando archivo %li de %li a velocidad desconocida" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Descargando archivo %li de %li a %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -928,8 +928,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Instalando actualizaciones" +msgid "Distribution updates" +msgstr "_Continuar actualización" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -943,87 +943,66 @@ msgid "Version %s: \n" msgstr "Versión %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Descargando la lista de cambios..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Comprobar" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Tamaño de descarga: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Por favor, espere; esto puede tardar un poco." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "La actualización se ha completado" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Comprobar las actualizaciones disponibles" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nueva versión: %s (Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Su distribución ya no está soportada" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1033,17 +1012,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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Está disponible la nueva versión «%s» de la distribución</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "El índice de software está dañado" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1053,12 +1032,35 @@ msgstr "" "gestor de paquetes «Synaptic», o ejecute «sudo apt-get install -f» en una " "terminal, para corregir este problema primero." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Debe comprobar las actualizaciones manualmente</big></b>\n" "\n" @@ -1084,34 +1086,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>¿Comenzar la actualización?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Cancelar _descarga" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Comprobar" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Comprobar si hay nuevas actualizaciones en los canales de software" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Descripción" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Notas de publicación" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1119,15 +1117,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Mostrar el progreso de cada archivo individual" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Actualizaciones de software" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1135,37 +1133,37 @@ msgstr "" "Las actualizaciones de software corrigen errores, eliminan fallos de " "seguridad y proporcionan nuevas funcionalidades." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "A_ctualizar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualizar a la última versión de Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Comprobar" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Continuar actualización" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Ocultar esta información en el futuro" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Instalar actualizaciones" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1199,27 +1197,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Añadir _CD-ROM" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autenticación" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Borrar archivos de software descargados:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "La descarga se ha completado" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importar la clave pública desde un proveedor de confianza" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Actualizaciones por Internet" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1227,51 +1230,51 @@ msgstr "" "Sólo se instalarán automáticamente las actualizaciones de seguridad que " "provengan de los servidores oficiales de Ubuntu." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Restaurar valores predeterminados" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Restaurar las claves predeterminadas de su distribución" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Propiedades del software" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Fuente" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Comprobar actualizaciones automáticamente:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Descargar actualizaciones en segundo plano, pero sin instalarlas" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Importar clave" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Instalar actualizaciones de seguridad sin requerir confirmación" @@ -1666,6 +1669,16 @@ msgstr "Software compatible con la DFSG con dependencias no libres" msgid "Non-DFSG-compatible Software" msgstr "Software no compatible con la DFSG" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Descargando archivo %li de %li a velocidad desconocida" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Instalando actualizaciones" + +#~ msgid "Cancel _Download" +#~ msgstr "Cancelar _descarga" + #~ msgid "Some software no longer officially supported" #~ msgstr "Algunos programas ya no están soportados oficialmente" @@ -1757,9 +1770,6 @@ msgstr "Software no compatible con la DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Claves</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Añadir _CD-ROM" - #~ msgid "Installation Media" #~ msgstr "Soporte de la instalación" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n" "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n" @@ -87,50 +87,50 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "Ohjelmistokanava" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "Aktiivinen" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Lähdekoodi" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Lähdekoodi" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Tuo avain" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -141,11 +141,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Syötä nimi levylle" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Aseta levy asemaan:" @@ -162,20 +162,20 @@ msgstr "" "ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen " "jatkamista." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Ei voida päivittää tarvittavia metapaketteja" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -187,11 +187,11 @@ msgstr "" "korjata. Ilmoita tästä virheraportilla. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Joitain paketteja todennettaessa tapahtui virhe" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -201,12 +201,12 @@ msgstr "" "Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista " "paketeista." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Ei voitu asentaa pakettia \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,11 +214,11 @@ msgstr "" "Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Ei voitu arvata metapakettia" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -252,11 +252,11 @@ msgstr "" msgid "Reading cache" msgstr "Luetaan kätköä" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -264,11 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Ei löytynyt sopivaa palvelinta" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -289,11 +289,11 @@ msgstr "" "Jos valitset \"Ei\", päivitys keskeytyy." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Luo ja ota käyttöön oletusohjelmalähteet?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -306,11 +306,11 @@ msgstr "" "Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys " "keskeytyy." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Virhe ohjelmavarastotiedoissa" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -318,11 +318,11 @@ msgstr "" "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita " "tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -333,11 +333,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:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Virhe päivitettäessä" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -345,11 +345,11 @@ msgstr "" "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. " "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Levytilaa ei ole riittävästi" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -361,15 +361,15 @@ msgstr "" "komentoa 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Haluatko aloittaaa päivityksen?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Ei voitu asentaa päivityksiä" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -381,11 +381,11 @@ msgstr "" "Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. " "Korjaustoimenpiteet suoritettiin (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Päivityksiä ei voitu noutaa" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -393,17 +393,17 @@ msgstr "" "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. " "CD) toiminta ja yritä uudelleen. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Seuraavia paketteja ei enää tueta virallisesti, vaan ovat nyt yhteisön " @@ -412,23 +412,23 @@ msgstr "" "Jos sinulla ei ole 'universe'-ohjelmakanavaa otettuna käyttöön, nämä paketit " "suositellaan poistettaviksi seuraavassa kohdassa. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Poista vanhentuneet paketit?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Ohita tämä kohta" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Poista" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Virhe suoritettaesa" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -437,31 +437,31 @@ msgstr "" "lisätietoja. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Palautetaan alkuperäistä järjestelmän tilaa" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Tarkistetaan pakettienhallintaa" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Päivitetään ohjelmavarastotietoja" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Pakettitiedot viallisia" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -474,19 +474,19 @@ msgstr "" "enää löydetty.\n" "Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Pyydetään vahvistusta" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Päivitetään" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Etsitään vanhetuneita ohjelmia" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Järjestelmän päivitys on valmis." @@ -616,7 +616,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Järjestelmäsi on ajan tasalla" @@ -858,15 +858,15 @@ msgstr "" "Päivityksen todennus epäonnistui. Tämä voi johtua ongelmasta " "verkkoyhteydessä tai palvelimessa. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -907,8 +907,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Asennetaan päivityksiä" +msgid "Distribution updates" +msgstr "_Jatka päivitystä" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -922,88 +922,66 @@ msgid "Version %s: \n" msgstr "Versio: %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Noudetaan muutosluetteloa..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Tarkista" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -#, fuzzy -msgid "None" -msgstr "Ei-vapaa" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "%s täytyy noutaa" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Odota, tämä voi kestää jonkun aikaa." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Päivitys on valmis" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Tarkista saatavilla olevat päivitykset" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Uusi versio: %s (koko: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versio: %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Jakeluasi ei enää tueta" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1013,17 +991,17 @@ msgstr "" "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja " "päivittämisestä osoitteesta http://www.ubuntu.com/" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Uusi jakelujulkaisu \"%s\" on saatavilla</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Ohjelmaluettelo on rikkinäinen" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1033,12 +1011,36 @@ msgstr "" "Synaptic-pakettienhallintaa tai komentoa \"sudo apt-get install -f\" " "päätteessä." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +#, fuzzy +msgid "None" +msgstr "Ei-vapaa" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Sinun täytyy tarkistaa päivitykset itse</big></b>\n" "Sinun järjestelmäsi ei tutki päivityksiä automaattisesti. Voit muuttaa näitä " @@ -1063,34 +1065,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Aloita päivitys?</big/</b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Peruuta _nouto" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Muutokset" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Tarkista" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Tarkista onko ohjelmakanavissa uusia päivityksiä" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Kuvaus" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Julkaisutiedot" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1098,15 +1096,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Näytä edistyminen yksittäisten tiedostojen osalta" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Ohjelmapäivitykset" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1114,37 +1112,37 @@ msgstr "" "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia " "ominaisuuksia." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Päivitä" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Päivitä Ubuntun viimeisimpään versioon" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Tarkista" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Jatka päivitystä" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "P_iilota tämä tieto jatkossa" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Asenna päivitykset" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Muutokset" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1178,27 +1176,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Lisää _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Todennus" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Poista noudetut ohjelmatiedostot:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Lataus on valmis" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Asenna julkinen avain luotetulta ohjelmistotoimittajalta" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internet-päivitykset" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1206,51 +1209,51 @@ msgstr "" "Vain turvallisuuspäivitykset virallisilta Ubuntu-palvelimilta asennetaan " "automaattisesti." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Palauta _oletukset" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Palauta jakelusi oletusavaimet" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "<b>Ohjelmalähteet</b>" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Lähdekoodi" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Tarkista päivitykset automaattisesti:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Tuo avaintiedosto" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Asenna turvallisuuspäivitykset kysymättä" @@ -1643,6 +1646,16 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmat" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Asennetaan päivityksiä" + +#~ msgid "Cancel _Download" +#~ msgstr "Peruuta _nouto" + #~ msgid "Some software no longer officially supported" #~ msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" @@ -1727,9 +1740,6 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Avaimet</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Lisää _CD" - #~ msgid "Installation Media" #~ msgstr "Asennuslähteet" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz <paroz@email.ch>\n" "Language-Team: French <gnomefr@traduc.org>\n" @@ -88,52 +88,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Mises à jour des logiciels" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importer la clé" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Erreur lors de l'importation du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -144,11 +144,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Veuillez saisir un nom pour le disque" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Veuillez insérer un disque dans le lecteur :" @@ -165,20 +165,20 @@ msgstr "" "ce logiciel. Veuillez d'abord les réparer à l'aide de Synaptic ou d'apt-get " "avant de continuer." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Les meta-paquets désirés n'ont pu être mis à jour" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Impossible de calculer la mise à jour" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -190,11 +190,11 @@ msgstr "" "rapporter ce bogue. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -204,12 +204,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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installer « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -218,11 +218,11 @@ msgstr "" "rapporter ce bogue. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -256,11 +256,11 @@ msgstr "" msgid "Reading cache" msgstr "Lecture du cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -268,11 +268,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Aucun mirroir valide n'a pu être trouvé" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -293,11 +293,11 @@ msgstr "" "Sinon, la mise à jour sera annulée." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Générer les sources par défaut ?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -311,11 +311,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:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Informations sur le dépôt invalides" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -323,11 +323,11 @@ msgstr "" "La mise à jour des informations du dépôt a créé un fichier invalide. Merci " "de rapporter ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Sources provenant de tiers désactivées" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -338,11 +338,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:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Erreur lors de la mise à jour" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -351,11 +351,11 @@ msgstr "" "un problème de réseau. Veuillez vérifier votre connexion au réseau et " "réessayer." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Il n'y a pas assez d'espace libre sur le disque" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -368,15 +368,15 @@ msgstr "" "get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Voulez-vous commencer la mise à jour ?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Les mises à jour n'ont pu être installées" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -388,11 +388,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:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Les mises à jour n'ont pu être téléchargées" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -400,17 +400,17 @@ msgstr "" "Abandon de la mise à jour. Veuillez vérifier votre connexion Internet ou " "votre médium d'installation puis réessayez. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Ces paquets installées ne sont plus supportés officiellement. Ils sont " @@ -419,23 +419,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:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Enlever les paquets obsolètes ?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Passer cette étape" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Supprimer" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Erreur pendant la soumission" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -444,31 +444,31 @@ msgstr "" "ci-dessous pour plus d'informations. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Restaurer le système dans son état d'origine" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Vérification du gestionnaire de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Mise à jour des informations sur les dépôts en cours" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Information sur les paquet invalides" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -482,19 +482,19 @@ msgstr "" "Ceci est indique qu'une erreur important s'est produite, veuillez rapporter " "ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Demande de confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Mise à jour en cours" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Recherche de logiciels obsolètes" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "La mise à jour du système est terminée." @@ -629,7 +629,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Votre système est à jour" @@ -872,15 +872,15 @@ msgstr "" "Échec de l'authentification de la mise à jour. Il y a peut-être un problème " "avec le réseau ou avec le serveur " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Téléchargement du fichier %li sur %li à %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Téléchargement du fichier %li sur %li à %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -926,8 +926,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Installation des mises à jour" +msgid "Distribution updates" +msgstr "_Reprendre la mise à jour" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -941,87 +941,66 @@ msgid "Version %s: \n" msgstr "Version %s : \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Téléchargement de la liste des nouveautés…" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Vérifier" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Taille du téléchargement : %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Veuillez patienter, cela peut prendre du temps." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "La mise à jour est terminée" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Rechercher les mises à jour disponibles" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nouvelle version : %s (taille : %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Votre distribution n'est plus supportée" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1031,17 +1010,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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Une nouvelle version « %s » est disponible</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "La liste des logiciels est corrompue" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1051,12 +1030,35 @@ msgstr "" "utiliser d'abord le « Gestionnaire de paquets Synaptic » ou lancez « sudo " "apt-get install -f » dans un terminal pour réparer ce problème." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Vous devez vérifier manuellement la disponibilité de mises à jour</" "big></b>\n" @@ -1083,34 +1085,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Démarrer la mise à jour ?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "_Annuler le téléchargement" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changements" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Vérifier" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Vérifier les canaux logiciels pour de nouvelles mises à jour" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Notes de publication" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1118,15 +1116,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Afficher l'avancement des fichiers individuels" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Mises à jour des logiciels" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1134,37 +1132,37 @@ msgstr "" "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " "problèmes de sécurité et apporter de nouvelles fonctionalités." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "Mettre à _jour" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Vérifier" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Reprendre la mise à jour" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Masquer ces informations à l'avenir" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Installer les mises à jour" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Changements" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1198,28 +1196,33 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Ajouter un _CD-ROM" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Authentification" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Effacer les fichiers des logiciels téléchargés :" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Le téléchargement est terminé" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "" "Importer la clé publique d'un fournisseur de logiciels digne de confiance" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Mises à jour par Internet" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1227,52 +1230,52 @@ msgstr "" "Seules les mises à jour de sécurité des serveurs officiels d'Ubuntu seront " "automatiquement installées." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Restaurer les clés par _défaut" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Restaurer les clés par défaut de votre distribution" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Gestionnaire de canaux logiciels" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Source" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Rechercher des mises à jour automatiquement :" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "" "Télécharger les mises à jour en arrière-plan, mais ne pas les installer" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Importer la clé" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Installer les mises à jour de sécurité sans confirmation" @@ -1670,6 +1673,16 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Installation des mises à jour" + +#~ msgid "Cancel _Download" +#~ msgstr "_Annuler le téléchargement" + #~ msgid "Some software no longer officially supported" #~ msgstr "Certains logiciels ne sont plus supportés officiellement" @@ -1758,9 +1771,6 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Clés</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Ajouter un _CD-ROM" - #~ msgid "Installation Media" #~ msgstr "Médium d'installation" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz <marcuz@linux.it>\n" "Language-Team: Friulian <fur@li.org>\n" @@ -88,45 +88,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Impuarte la clâf" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -134,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -152,20 +152,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -174,34 +174,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +228,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,77 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -411,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -544,7 +544,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -768,14 +768,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -812,7 +812,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -826,114 +826,114 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -949,34 +949,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -984,49 +980,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1058,73 +1054,77 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n" "Language-Team: Galego\n" @@ -89,52 +89,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Actualizacións de software" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Fonte" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Fonte" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Erro importando o ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Erro ao quitar a clave" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -142,11 +142,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -160,20 +160,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -185,23 +185,23 @@ msgstr "" "erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -211,11 +211,11 @@ msgstr "" "erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +242,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -284,43 +284,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "Erro ao quitar a clave" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -346,78 +346,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "Xa hai outro xestor de paquetes en execución" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -427,20 +427,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "Actualización rematada" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -562,7 +562,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado!" @@ -794,14 +794,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -845,7 +845,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "Instalando actualizacións..." #. TRANSLATORS: updates from an 'unknown' origin @@ -861,116 +861,116 @@ msgstr "Versión %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Descargando cambios" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "A súa distribución xa non está soportada" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -986,34 +986,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Descrición" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1021,51 +1017,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Actualizacións de software" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "Instalando actualizacións..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1100,80 +1096,84 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +msgid "Add Cdrom" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autenticación" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Download from:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Eliminar a clave seleccionada do anel de confianza." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>Actualizacións por Internet</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurar predeterminados" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Restaurar as claves predeterminadas" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Propiedades de software" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Fonte" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "Comprobar se hai actualizacións cada" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1561,6 +1561,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Instalando actualizacións..." + +#, fuzzy #~ msgid "Important security updates of Ubuntu" #~ msgstr "Actualizacións de seguranza de Ubuntu 5.10" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -92,48 +92,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "עדכוני תוכנה" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "מקור" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "מקור" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "שגיאה בייבוא קובץ נבחר" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -144,11 +144,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "אנא הכניסו תקליטור לכונן:" @@ -164,20 +164,20 @@ msgstr "" "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן " "באמצעות synaptic או apt-get לפני שתמשיך." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "חבילה חיונית תוסר בלית ברירה" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -189,34 +189,34 @@ msgstr "" "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "לא ניתן להתקין את \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -246,11 +246,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -288,32 +288,32 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "שגיאה במהלך העדכון" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת " "שלכם ונסו שנית." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "אין מספיק שטח בדיסק הקשיח" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -334,15 +334,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "האם ברצונך להתחיל את השדרוג?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "לא ניתן להתקין את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -351,79 +351,79 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "לא ניתן להוריד את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" "השדרוג בוטל. אנא בדקו את החיבור לאינטרנט או את מדיית ההתקנה ונסו שנית. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_דלג על השלב" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_הסר" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 #, fuzzy msgid "Restoring original system state" msgstr "מאתחל את המערכת" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -435,19 +435,19 @@ msgstr "" "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n" "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "משדרג" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "שדרוג המערכת הושלם." @@ -571,7 +571,7 @@ msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "המערכת שלך מעודכנת!" @@ -801,15 +801,15 @@ msgid "" "or with the server. " msgstr "אימות השדרוג נכשל. עלולה להיות בעיה עם הרשת או עם השרת. " -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, fuzzy, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, fuzzy, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה" +msgid "Downloading file %(current)li of %(total)li" +msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -850,8 +850,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "מתקין עדכונים..." +msgid "Distribution updates" +msgstr "_המשך בשידרוג" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -866,117 +866,117 @@ msgstr "גרסה %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "מוריד שינוייים" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "מתקין עדכונים..." msgstr[1] "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 #, fuzzy msgid "Update is complete" msgstr "ההורדה הושלמה" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "גרסה %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "ההפצה שלך כבר לא נתמכת, סליחה." -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -1000,34 +1000,30 @@ msgstr "" "%s" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "שינויים" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "תיאור" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1035,52 +1031,52 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "עדכוני תוכנה" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_המשך בשידרוג" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "מתקין עדכונים..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "שינויים" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1115,81 +1111,85 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +msgid "Add Cdrom" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "אימות" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "ההורדה הושלמה" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "הסר את המפתח הנבחר מרשימת המפתחות שאתה בוטח בהם." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>עדכוני אינטרנט</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "שחזר ברירת מחדל" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "שחזר מפתחות ברירת מחדל" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "מאפייני תוכנה" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "מקור" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "בדוק לעדכונים כל" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1575,6 +1575,14 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "מתקין עדכונים..." + #~ msgid "Could not find any upgrades" #~ msgstr "לא ניתן למצוא שדרוג זמין" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n" "Language-Team: Hindi <hi@li.org>\n" @@ -88,45 +88,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -134,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -152,20 +152,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -174,34 +174,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +228,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,77 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -411,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -544,7 +544,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -768,14 +768,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -812,7 +812,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -826,114 +826,114 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -949,34 +949,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -984,49 +980,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1058,73 +1054,77 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić <ivoks@ubuntu.com>\n" "Language-Team: Croatian <hr@li.org>\n" @@ -89,47 +89,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Nadogradnje programa" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Unos ključa" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Greška prilikom uvoženja odabrane datoteke" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Greška prilikom brisanja ključa" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -140,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Upišite ime za disk" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Ubacite CD u uređaj:" @@ -160,20 +160,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:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Ne mogu nadograditi potrebne meta-pakete" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Nisam mogao riješiti nadogradnju" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -185,11 +185,11 @@ msgstr "" "prijavite ovo kao grešku. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Greška prilikom identificiranja nekih paketa" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -199,12 +199,12 @@ msgstr "" "problem sa mrežom i trebali biste kasnije pokušati ponovo. Pogledajte popis " "neidentificiranih paketa." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Ne mogu instalirati '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -213,11 +213,11 @@ msgstr "" "grešku. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Nisam mogao odrediti meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -250,11 +250,11 @@ msgstr "" msgid "Reading cache" msgstr "Čitam spremnik" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -262,11 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Nisam našao ispravan zrcalni poslužitelj" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +286,11 @@ msgstr "" "Ako odaberete 'ne' nadogradnja će se prekinuti." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Kreirati uobičajene izvore?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +303,11 @@ msgstr "" "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja će " "prekinuti." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Podaci repozitorija neispravni" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,11 +315,11 @@ msgstr "" "Nadogradnja podataka repozitorija je rezultirala neispravnom datotekom. " "Molim, prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Izvori trećih strana su isključeni" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -330,11 +330,11 @@ msgstr "" "ih uključiti nakon nadogradnje sa 'software-properties' alatom ili sa " "synapticom." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Greška prilikom nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Nema dovoljno praznog mjesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -358,15 +358,15 @@ msgstr "" "koristeći 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Želite li pokrenuti nadogradnju?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Nisam mogao instalirati nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -378,11 +378,11 @@ msgstr "" "Nadogradnja se prekida. Vaš sistem bi mogao biti u neupotrebljivom stanju. " "Obnavljanje je pokrenuto (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Nisam mogao preuzeti nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -390,17 +390,17 @@ msgstr "" "Nadogradnja se prekida. Molim provjerite vašu internet vezu ili " "instalacijski medij i pokušajte ponovo. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Ovi instalirani paketi više nisu službeno podržani i sada se nalaze u " @@ -409,23 +409,23 @@ msgstr "" "Ako nemate omogućen 'universe' repozitorij, ovi paketi biti će predloženi za " "uklanjanje. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Ukloniti zastarjele pakete?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Preskoči ovaj korak" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Ukloni" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Greška prilikom čina" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,31 +434,31 @@ msgstr "" "više informacija. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Vraćam u početno stanje" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Provjeravam upravitelja paketima" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Nadograđujem podatke repozitorija" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Neispravni podaci paketa" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -471,19 +471,19 @@ msgstr "" "naći.\n" "Ovo upućuje na ozbiljnu grešku, molim prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Pitam za potvrdu" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Nadograđujem" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Tražim zastarjele programe" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Nadogradnja sustava je završena." @@ -619,7 +619,7 @@ msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke." #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Vaš sustav sadrži posljednje nadogradnje" @@ -861,15 +861,15 @@ msgstr "" "Autorizacija nadogradnje nije uspjela. Vjerovatno je problem u mreži ili sa " "poslužiteljem. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Preuzimam datoteku %li od %li pri %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Preuzimam datoteku %li od %li pri %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -913,8 +913,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Instaliraj nadogradnje" +msgid "Distribution updates" +msgstr "_Nastavi nadogradnju" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -928,47 +928,26 @@ msgid "Version %s: \n" msgstr "Verzija %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Preuzimam popis promjena..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "Pro_vjeri" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Veličina preuzimanja: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -976,40 +955,40 @@ msgstr[0] "Možete instalirati %s nadogradnju" msgstr[1] "Možete instalirati %s nadogradnje" msgstr[2] "Možete instalirati %s nadogradnji" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_Instaliraj nadogradnje" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nova verzija: %s (Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Verzija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Vaša distibucija više nije podržana" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +998,17 @@ msgstr "" "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više " "detalja o nadogradnji." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Popis programa je oštećen" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1039,12 +1018,35 @@ msgstr "" "upravitelja paketima \"Synaptic\" ili upišite \"sudo apt-get install -f\" u " "terminal za ispravljanje ovog problema." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Morate ručno provjeriti postojanje nadogradnji</big></b>\n" "\n" @@ -1069,34 +1071,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Pokrenuti nadogradnju?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Prekini _preuzimanje" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Promjene" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "P_rovjeri" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Provjeri repozitorije za nove nadogradnje" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Opis" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Bilješke izdanja" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1104,15 +1102,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Prikaži napredak pojedinih datoteka" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Nadogradnje programa" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1120,37 +1118,37 @@ msgstr "" "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " "donose nove mogućnosti." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "Na_dogradnja" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Nadogradi na zadnju verziju Ubuntua" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "Pro_vjeri" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Nastavi nadogradnju" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "Ubuduće _sakrij ovu informaciju" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Instaliraj nadogradnje" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Promjene" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1184,27 +1182,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Dodaj _CD-ROM" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autorizacija" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Obriši dobavljene datoteke programa:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Preuzimanje je završeno" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Uvezi javni ključ od pouzdanog davatelja programa" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internet nadogradnje" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1212,50 +1215,50 @@ msgstr "" "Samo sigrnosne nadogradnje sa službenih Ubuntu poslužitelja biti će " "instalirane automatski" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Vrati _uobičajene postavke" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Vrati uobičajene ključeve vaše distribucije" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Postavke nadogradnje" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Provjeri postojanje nadogradnji automatski:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "P_reuzmi nadogradnje u pozadini, ali ih ne instaliraj" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Unesi datoteku ključa" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Instaliraj sigurnosne nadogradnje bez potvrde" @@ -1644,6 +1647,16 @@ msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima" msgid "Non-DFSG-compatible Software" msgstr "DFSG-nekompatibilni programi" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Instaliraj nadogradnje" + +#~ msgid "Cancel _Download" +#~ msgstr "Prekini _preuzimanje" + #~ msgid "Some software no longer officially supported" #~ msgstr "Neki paketi više nisu službeno podržani" @@ -1730,9 +1743,6 @@ msgstr "DFSG-nekompatibilni programi" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Kjučevi</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Dodaj _CD-ROM" - #~ msgid "Installation Media" #~ msgstr "Instalacijski medij" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" @@ -88,47 +88,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Szoftverfrissítések" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Kulcs importálása" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Kérem, adja meg a lemez nevét" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:" @@ -160,20 +160,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:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "A szükséges meta-csomagok nem frissíthetőek" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Nem tudom megtervezni a frissítés menetét" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -185,11 +185,11 @@ msgstr "" "jelentse ezt hibaként. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -199,23 +199,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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "'%s' nem telepíthető" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 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:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Nem tudom megállapítani a meta-csomagot" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -249,11 +249,11 @@ msgstr "" msgid "Reading cache" msgstr "Gyorsítótár beolvasása" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "nem található érvényes tükör" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +286,11 @@ msgstr "" "A \"Nem\" kiválasztása megszakítja a frissítést." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Alapértelmezett források ismételt előállítása?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -304,11 +304,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:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Érvénytelen csomagtároló információ" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -316,11 +316,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:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "A külső források letiltva" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -331,11 +331,11 @@ msgstr "" "a frissítés után a Szoftvertulajdonságok eszközzel, vagy a Synaptic " "csomagkezelővel." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Hiba történt a frissítés közben" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Nincs elég szabad hely a merevlemezen" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +359,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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Biztosan el szeretné kezdeni a frissítést?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "A frissítések nem telepíthetők" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,11 +379,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:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "A frissítések nem tölthetők le" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -391,17 +391,17 @@ 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:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Ezek a telepített csomagok már nincsenek hivatalosan támogatva, csak a " @@ -410,23 +410,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:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Eltávolítja az elavult csomagokat?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "Ezen lé_pés kihagyása" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Eltávolítás" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Hiba a módosítások rögzítése közben" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,31 +435,31 @@ msgstr "" "információkat tartalmaz a hibára vonatkozóan. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "A rendszer eredeti állapotának helyreállítása" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Csomagkezelő ellenőrzése" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Csomagtároló információ frissítése" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Érvénytelen csomaginformációk" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -472,19 +472,19 @@ msgstr "" "található többé.\n" "Ez egy komoly problémát jelez, jelentse hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Megerősítés kérése" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Frissítés folyamatban" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Elavult szoftverek keresése" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "A rendszer frissítése befejeződött." @@ -617,7 +617,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "A rendszere naprakész" @@ -858,15 +858,15 @@ msgstr "" "A frissítés hitelesítése meghiúsult. Probléma lehet a hálózattal vagy a " "kiszolgálóval. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -908,8 +908,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Telepítés" +msgid "Distribution updates" +msgstr "Frissítés _folytatása" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -923,86 +923,65 @@ msgid "Version %s: \n" msgstr "%s verzió: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Módosítások listájának letöltése..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Ellenőrzés" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Letöltés mérete: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Kis türelmet, ez eltarthat egy ideig." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "A frissítés befejeződött" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_Telepítés" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Új verzió: %s (Méret: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "%s verzió: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "A terjesztés már nem támogatott" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +991,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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>A disztribúció új \"%s\" kiadása elérhető</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "A szoftverindex sérült" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1032,12 +1011,35 @@ msgstr "" "csomagkezelőt vagy futtassa a \"sudo apt-get install -f\" parancsot egy " "terminálban a probléma megoldása érdekében." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Önnek kézzel kell megkeresnie a rendelkezésre álló frissítéseket</" "big></b>\n" @@ -1064,34 +1066,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Megkezdi a frissítést?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Letöltés _megszakítása" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Módosítások" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Ellenőrzés" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Frissítések keresése a szoftvercsatornákon" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Leírás" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Kiadási megjegyzések" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1099,15 +1097,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Egyes fájlok állapotának mutatása" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Szoftverfrissítések" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1115,37 +1113,37 @@ msgstr "" "A szoftverfrissítések kijavítják a programhibákat, biztonsági " "sebezhetőségeket és új szolgáltatásokat biztosítanak." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Frissítés" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Frissítés az Ubuntu legújabb változatára" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Ellenőrzés" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "Frissítés _folytatása" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_A jövőben ne mutassa ezt az információt" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Telepítés" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Módosítások" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1179,27 +1177,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "_CD hozzáadása" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Hitelesítés" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "L_etöltött csomagok törlése:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "A letöltés befejeződött" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Megbízható szoftverszolgáltató publikus kulcsának importálása" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Hálózati frissítések" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1207,50 +1210,50 @@ msgstr "" "Csak az Ubuntu kiszolgálóiról származó biztonsági frissítések kerülnek " "automatikusan telepítésre." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "_Alapértelmezés visszaállítása" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "A disztribúcióra jellemző alapértelmezett kulcsok visszaállítása" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Szoftvertulajdonságok" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Frissítések automatikus keresése:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "Frissítések _letöltése a háttérben, telepítés nélkül" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Kulcsfájl importálása" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Biztonsági frissítések telepítése megerősítés nélkül" @@ -1640,6 +1643,16 @@ msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Telepítés" + +#~ msgid "Cancel _Download" +#~ msgstr "Letöltés _megszakítása" + #~ msgid "Some software no longer officially supported" #~ msgstr "Néhány szoftver már nincs hivatalosan támogatva" @@ -1728,9 +1741,6 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Kulcsok</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "_CD hozzáadása" - #~ msgid "Installation Media" #~ msgstr "Telepítő média" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani <imtheface@gmail.com>\n" "Language-Team: Indonesian <id@li.org>\n" @@ -87,48 +87,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Perangkat Lunak Mutakhir" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Impor kunci" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Kesalahan mengimpor berkas terpilih" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Kesalahan menghapus kunci" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Silakan masukkan nama untuk cakram" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Silakan masukan cakram ke dalam penggerak" @@ -160,20 +160,20 @@ msgstr "" "perangkat lunak ini. Silakan perbaiki terlebih dahulu dengan menggunakan " "synaptic atau apt-get sebelum melanjutkan hal ini." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menghitung pemutakhiran" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -185,11 +185,11 @@ msgstr "" "bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Kesalahan membuktikan keabsahan beberapa paket" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -199,12 +199,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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat menginstal '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -213,11 +213,11 @@ msgstr "" "ini sebagai bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Tidak dapat menebak meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -251,11 +251,11 @@ msgstr "" msgid "Reading cache" msgstr "Membaca cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -263,11 +263,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Tidak menemukan mirror yang valid" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -287,11 +287,11 @@ msgstr "" "Jika anda pilih 'no' pemutakhiran akan dibatalkan." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Membuat sumber baku?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -304,11 +304,11 @@ msgstr "" "Haruskah entri baku untuk '%s' ditambahkan? Jika anda pilih 'No' " "pemutakhiran akan dibatalkan." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Informasi gudang tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -316,11 +316,11 @@ msgstr "" "Meng-upgrade informasi gudang berakhir di dalam berkas yang tidak benar. " "Silakan laporkan ini sebagai bug." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Sumber dari pihak ketiga dilumpukan" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -331,11 +331,11 @@ msgstr "" "dapat mengaktifkan kembali setelah upgrade dengan alat 'software-properties' " "atau dengan synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Kesalahan pada waktu pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah " "jaringan, silakan periksa koneksi jaringan anda dan ulangi." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Kapasitas cakram tidak mencukupi" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +359,15 @@ msgstr "" "instalasi terdahulu dengan menggunakan 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Apakah anda ingin memulai pemutakhiran?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Tidak dapat menginstal pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,11 +379,11 @@ msgstr "" "Upgrade dibatalkan sekarang. Sistem anda dapat menjadi tidak dapat " "digunakan. Perbaikan sedang berjalan (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Tidak dapat mengunduh pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -391,17 +391,17 @@ msgstr "" "Upgrade dibatalkan sekarang. Silakan periksa koneksi internet anda atau " "media instalasi dan coba lagi nanti. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Paket terinstal ini tidak lagi mendapat sokongan resmi, dan sekarang hanya " @@ -410,23 +410,23 @@ msgstr "" "Jika anda tidak mengaktifkan komponen 'universe' paket ini akan diajurkan " "untuk penghapusan dalam langkah selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Hapus paket usang?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Lewati Langkah Ini" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Hapus" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Kesalahan pada waktu commit" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,31 +435,31 @@ msgstr "" "bawah untuk informasi lebih lanjut. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Sistem dikembalikan ke keadaan awal" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Memeriksa manajer paket" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Memutakhirkan informasi gudang" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Informasi paket tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -473,19 +473,19 @@ msgstr "" "Ini mengindikasikan adanya kesalahan serius, silakan laporkan ini sebagai " "bug." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Menanyakan konfigurasi" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Meng-upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Mencari perangkat lunak usang" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Upgrade sistem telah selesai." @@ -615,7 +615,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Sistem anda telah up-to-date" @@ -854,15 +854,15 @@ msgstr "" "Otentikasi upgrade gagal. Mungkin terjadi masalah dengan jaringan atau " "dengan server. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Mengunduh berkas %li dari %li dengan %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Mengunduh berkas %li dari %li dengan %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -904,8 +904,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Instal Update" +msgid "Distribution updates" +msgstr "_Lanjutkan Upgrade" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -919,86 +919,65 @@ msgid "Version %s: \n" msgstr "Versi %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Mengunduh senarai dari perubahan..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Periksa" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Ukuran unduh: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Pemutakhiran selesai" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_Instal Update" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Versi baru: %s (Ukuran: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versi %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Distribusi anda tidak disokong lagi" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +987,17 @@ msgstr "" "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www." "ubuntu.com untuk informasi lebih lanjut." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Luncuran distribusi baru '%s' telah tersedia</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Indeks perangkat lunak telah rusak" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1028,12 +1007,35 @@ msgstr "" "Silakan gunakan manajer paket \"Synaptic\" atau jalankan \"sudo apt-get " "install -f\" dalam terminal untuk memperbaiki persoalan ini." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Anda harus memeriksa pemutakhiran secara manual</big></b>\n" "\n" @@ -1059,34 +1061,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Mulai upgrade?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Batalkan _Unduh" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Perubahan" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Peri_ksa" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Periksa kanal perangkal lunak untuk pemutakhiran terbaru" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Deskripsi" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Catatan Luncuran" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1094,15 +1092,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Tampilkan kemajuan dari berkas tunggal" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Perangkat Lunak Mutakhir" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1110,37 +1108,37 @@ msgstr "" "Perangkat lunak nutakhir memperbaiki kesalahan, menyingkirkan kelemahan " "keamanan dan menyediakan fitur baru." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade ke versi Ubuntu terakhir" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Periksa" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Lanjutkan Upgrade" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Sembunyikan informasi ini di masa depan" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Instal Update" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Perubahan" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1174,27 +1172,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Tambah _Cdrom" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Otentikasi" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "H_apus berkas perangkat lunak yang telah diunduh:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Unduh telah selesai" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Impor kunci publik dari penyedia perangkal lunak terpercaya" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Pemutakhiran lewat Internet" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1202,50 +1205,50 @@ msgstr "" "Hanya pemutakhiran keamanan dari server resmi Ubuntu yang akan diinstal " "secara otomatis" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Kembali ke _Baku" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Kembalikan kunci baku dari distribusi anda" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Properti Perangkat Lunak" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Periksa pemutakhiran secara otomatis:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Unduh pemutakhiran di latar belakang, tetapi jangan diinstal" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Impor Berkas Kunci" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Instal pemutakhiran keamanan tanpa perlu konfirmasi" @@ -1635,6 +1638,16 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Instal Update" + +#~ msgid "Cancel _Download" +#~ msgstr "Batalkan _Unduh" + #~ msgid "Some software no longer officially supported" #~ msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" @@ -1725,9 +1738,6 @@ msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Kunci</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Tambah _Cdrom" - #~ msgid "Installation Media" #~ msgstr "Media Instalasi" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n" "Language-Team: Italian <it@li.org>\n" @@ -89,52 +89,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Aggiornamenti Software" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Sorgente" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Sorgente" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importa chiave" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Errore nell'importare il file selezionato" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Errore nel rimuovere la chiave" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -145,11 +145,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Inserire un nome per il disco" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Inserire un disco nell'unità:" @@ -166,20 +166,20 @@ msgstr "" "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get" "\" per risolvere il probelma." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Impossibile aggiornare i meta-pacchetti richiesti" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'aggiornamento" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -191,11 +191,11 @@ msgstr "" "dell'aggiornamento. Notificare questo evento come bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Errore nell'autenticare alcuni pacchetti" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -205,12 +205,12 @@ msgstr "" "un problema di rete passeggero, riprovare più tardi. Segue una lista di " "pacchetti non autenticati." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Impossibile installare \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -219,11 +219,11 @@ msgstr "" "evento come bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -257,11 +257,11 @@ msgstr "" msgid "Reading cache" msgstr "Lettura della cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -269,11 +269,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Non è stato trovato alcun mirror valido" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -294,11 +294,11 @@ msgstr "" "Scegliendo di no, l'aggiornamento verrà annullato." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Generare le sorgenti predefinite?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -312,11 +312,11 @@ msgstr "" "Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento " "verrà annullato." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Informazioni sul repository non valide" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -324,11 +324,11 @@ msgstr "" "L'aggiornamento delle informazioni sul repository ha generato un file non " "valido. Notificare questo evento come bug." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Sorgenti di terze parti disabilitate" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -339,11 +339,11 @@ msgstr "" "list». È possibilie abilitarle di nuovo dopo l'aggiornamento con lo " "strumento «software-properties» o con synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Errore durante l'aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -351,11 +351,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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Spazio libero su disco insufficiente" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -367,15 +367,15 @@ msgstr "" "usando \"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Iniziare l'aggiornamento?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Impossibile installare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -388,11 +388,11 @@ msgstr "" "uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -" "a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Impossibile scaricare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -400,17 +400,17 @@ msgstr "" "Interruzione immediata dell'aggiornamento. Controllare la connessione a " "internet o il supporto di installazione e riprovare. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Questi pacchetti, pur essendo installati, non sono più supportati " @@ -420,23 +420,23 @@ msgstr "" "Se non è abilitato il repository «universe», verrà suggerita la rimozione di " "questi pacchetti al prossimo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Rimuovere i pacchetti obsoleti?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Salta questo passo" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Rimuovi" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Errore durante il commit" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -445,31 +445,31 @@ msgstr "" "seguente per maggiori informazioni. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Ripristino stato originale del sistema" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Controllo gestore dei pacchetti" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Aggiornamento delle informazione sui repository" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Informazioni di pacchetto non valide" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -482,19 +482,19 @@ msgstr "" "trovare il pacchetto essenziale «%s».\n" "Ciò indica un errore grave, segnalare questo evento come un bug." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Richiesta di conferma" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Ricerca di software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "L'aggiornamento del sistema è stato completato." @@ -629,7 +629,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Il sistema è aggiornato!" @@ -871,15 +871,15 @@ msgstr "" "Fallita l'autenticazione dell'aggiornamento. Potrebbe dipendere da un " "problema con la connessione di rete o con il server. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Scaricamento del file %li di %li a %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Scaricamento del file %li di %li a velocità sconosciuta" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Scaricamento del file %li di %li a %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -923,8 +923,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Installazione degli aggiornamenti" +msgid "Distribution updates" +msgstr "_Riprendi aggiornamento" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -938,87 +938,66 @@ msgid "Version %s: \n" msgstr "Versione %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Scaricamento dell'elenco dei cambiamenti..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Verifica" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Dati da scaricare: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Attendere, l'operazione potrebbere richiedere del tempo." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Aggiornamento completato" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Verifica degli aggiornamenti..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nuova versione: %s (Dimensione: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versione %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "La distribuzione in uso non è più supportata" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +1007,17 @@ msgstr "" "versione più aggiornata di Ubuntu Linux. Per maggiori informazioni " "consultare http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "L'indice dei programmi è rovinato" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1048,12 +1027,35 @@ msgstr "" "dei pacchetti \"Synaptic\" o inserire il comando \"sudo apt-get install -f\" " "in un terminale per risolvere il problema." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>È necessario controllare gli aggiornamenti manualmente</big></b>\n" "\n" @@ -1079,34 +1081,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Avviare l'aggiornamento?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Annulla _scaricamento" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambiamenti" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Verifica" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Verifica la presenza di nuovi aggiornamenti nei canali software" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Descrizione" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Note di rilascio" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1114,15 +1112,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Mostra l'avanzamento dei singoli file" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Aggiornamenti software" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1130,37 +1128,37 @@ msgstr "" "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " "sicurezza ed aggiungono nuove funzionalità." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "A_ggiorna" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aggiorna all'ultima versione di Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Verifica" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Riprendi aggiornamento" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Non mostrare più queste informazioni" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "I_nstalla aggiornamenti" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Cambiamenti" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1194,27 +1192,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Aggiungi C_D-ROM" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autenticazione" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Elimina i file di software scaricati:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Scaricamento completato" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importa la chiave pubblica da un fornitore di software fidato" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Aggiornamenti internet" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1222,51 +1225,51 @@ msgstr "" "Solo gli aggiornamenti di sicurezza dai servers ufficiali di Ubuntu saranno " "installati automaticamente" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Ripristina pre_definite" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Ripristina le chiavi predefinite della distribuzione in uso" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Proprietà software" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Sorgente" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Verificare aggiornamenti automaticamente:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Scaricare gli aggiornamenti in background, ma non installarli" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "I_mporta file chiave" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "I_nstallare gli aggiornamenti di sicurezza senza richiedere conferma" @@ -1662,6 +1665,16 @@ msgstr "Software compatibile con le DFSG con dipendenze non libere" msgid "Non-DFSG-compatible Software" msgstr "Software non compatibile con le DFSG" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Scaricamento del file %li di %li a velocità sconosciuta" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Installazione degli aggiornamenti" + +#~ msgid "Cancel _Download" +#~ msgstr "Annulla _scaricamento" + #~ msgid "Some software no longer officially supported" #~ msgstr "Software non più supportato ufficialmente" @@ -1753,9 +1766,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Chiavi</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Aggiungi C_D-ROM" - #~ msgid "Installation Media" #~ msgstr "Supporto di installazione" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n" "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n" @@ -89,49 +89,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "ソフトウェアのアップデート" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "ソース" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "ソース" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "鍵のインポート" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "選択したファイルのインポートエラー" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "選択したファイルはGPG鍵ファイルではないか、壊れている可能性があります。" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "鍵削除のエラー" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択した鍵を削除できませんでした。バグとして報告してください。" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -142,11 +142,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "ディスク名を入力してください" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "ディスクをドライブに挿入してください:" @@ -162,20 +162,20 @@ msgstr "" "システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま" "す。 Synaptic や apt-get を使って最初に修正してください。" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "要求されたメタパッケージがアップグレードできません" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "必須パッケージが削除されます" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "アップグレードが算定できません" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -185,11 +185,11 @@ msgid "" msgstr "算定中に解決できない問題がおきました。バグとして報告してください。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "いくつかのパッケージが認証されませんでした" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -199,12 +199,12 @@ msgstr "" "クの問題でしょう。あとで再び試してみてください。下に認証できなかったパッケー" "ジが表示されます。" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "'%s' がインストールできません" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,11 +212,11 @@ msgstr "" "要求されたパッケージのインストールができません。バグとして報告してください。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "メタパッケージを推測できません" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -250,11 +250,11 @@ msgstr "" msgid "Reading cache" msgstr "キャッシュを読み込み中" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -262,11 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "正しいミラーが見つかりません" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +285,11 @@ msgstr "" "キャンセルします。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "標準のソースを生成しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -302,11 +302,11 @@ msgstr "" "'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートを" "キャンセルします。" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "リポジトリ情報が無効です" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -314,11 +314,11 @@ msgstr "" "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報" "告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "公式ではないソースが無効になりました" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -329,11 +329,11 @@ msgstr "" "アップグレード後に 'ソフトウェアのプロパティ' ツールか Synaptic を使用してく" "ださい。" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "アップデート中にエラー発生" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。" "ネットワーク接続をチェックし、再びアップデートしてください。" -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "ディスクの空き領域が足りません" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +357,15 @@ msgstr "" "た一時パッケージを削除してください。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "アップグレードを開始しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "アップグレードをインストールできません" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +377,11 @@ msgstr "" "アップグレードを中断しました。システムが使用できない状態になっている可能性が" "あります。ただいま修正を実行中です (dpkg --configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "アップグレードをダウンロードできません" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,17 +389,17 @@ msgstr "" "アップグレードを中断しました。インターネット接続またはインストールメディア" "(CD-ROMなど)をチェックし。再試行してください。 " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "インストールされているこれらのパッケージは、もう公式にサポートされておらず、" @@ -408,23 +408,23 @@ msgstr "" "'universe' を有効にしないと、これらのパッケージは次のステップで削除することを" "提案します。 " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "不要なパッケージを削除しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "このステップをスキップ(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "削除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "コミット中にエラー" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -433,31 +433,31 @@ msgstr "" "ください。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "システムを元に戻し中" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "パッケージマネージャをチェック中" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "リポジトリ情報をアップデート" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "無効なパッケージ情報" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -469,19 +469,19 @@ msgstr "" "パッケージ情報のアップデートのあと、重要パッケージ '%s' が見つかりません。\n" "このメッセージは深刻なエラーです。バグとして報告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "確認する" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "アップグレード中" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "古いソフトウェアを検索する" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "システムのアップグレードが完了しました。" @@ -610,7 +610,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "システムは最新の状態です!" @@ -847,15 +847,15 @@ msgstr "" "アップグレードの認証に失敗しました。おそらくネットワークまたはサーバの問題で" "す。 " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "ダウンロード中: 速度不明で %li のうち %li" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -897,8 +897,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "アップデートをインストール中" +msgid "Distribution updates" +msgstr "アップグレードを再開する(_R)" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -912,86 +912,65 @@ msgid "Version %s: \n" msgstr "バージョン %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "変更点を取得中..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "チェック(_C)" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "ダウンロードサイズ: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 個のアップデートがインストールされます" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "しばらくお待ちください。少々時間がかかります。" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "アップデートが完了しました" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "インストールできるアップデートをチェック" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "新しいバージョン: %s (サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "バージョン %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "このディストリビューションはすでにサポート対象外です" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1001,17 +980,17 @@ msgstr "" "Ubuntu Linux にアップグレードしてください。\r\n" "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "ソフトウェアのインデックスが壊れています" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1021,12 +1000,35 @@ msgstr "" "ケージマネージャを使用するか、 まずこの問題を解決するために \"sudo apt-get " "install -f\" コマンドをターミナルで実行してください。" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>アップデートの情報を手動でチェックしてください</big></b>\n" "\n" @@ -1052,34 +1054,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>アップグレードを開始しますか？</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "ダウンロードをキャンセル(_D)" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "変更点" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "再チェック(_K)" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "新しいアップデートの調査のためにソフトウェアチャンネルをチェックします" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "説明" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "リリースノート" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1087,15 +1085,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "個々のファイルの進捗を表示" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "ソフトウェアのアップデート" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1103,37 +1101,37 @@ msgstr "" "ソフトウェアアップデートはエラーを訂正し、セキュリティホールを修正し、新機能" "を提供します。" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "アップグレード(_P)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Ubuntu の最新バージョンにアップグレード" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "チェック(_C)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "アップグレードを再開する(_R)" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "今後この情報を隠す(_H)" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "アップデートをインストール(_I)" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "変更点" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1167,27 +1165,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "CD-ROM の追加(_C)" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "認証" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "ダウンロードしたファイルを削除(_E):" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "ダウンロードが完了しました" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "信頼したソフトウェア供給者の公開鍵をインポートする" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "インターネットアップデート" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1195,51 +1198,51 @@ msgstr "" "公式な Ubuntu サーバからのセキュリティアップデートだけ自動的にインストールさ" "れます。" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "デフォルトに戻す(_D)" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "ディストリビューション標準の鍵を元に戻す" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "ソフトウェアのプロパティ" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "ソース" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "アップデートを自動的にチェックする(_C):" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "アップデートを自動的にダウンロード、ただしインストールはしない(_D)" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "鍵ファイルのインポート(_I)" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "確認せずにセキュリティアップデートをインストール(_I)" @@ -1629,6 +1632,16 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア" msgid "Non-DFSG-compatible Software" msgstr "DFSGに適合しないソフトウェア" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "ダウンロード中: 速度不明で %li のうち %li" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "アップデートをインストール中" + +#~ msgid "Cancel _Download" +#~ msgstr "ダウンロードをキャンセル(_D)" + #~ msgid "Some software no longer officially supported" #~ msgstr "いくつかのソフトウェアはもう公式にサポートされません" @@ -1717,9 +1730,6 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "<b>Keys</b>" #~ msgstr "<b>鍵</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "CD-ROM の追加(_C)" - #~ msgid "Installation Media" #~ msgstr "インストールメディア" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n" "Language-Team: Georgian <geognome@googlegroups.com>\n" @@ -90,49 +90,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "პროგრამული განახლებები" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "გასაღების იმპორტი" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "ამორჩეული ფაილის იმპორტი ვერ მოხერხდა" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "ამორჩეული ფაილი შეიძლება არ იყოს GPG გასაღების ფაილი ან შეიძლება იყოს " "დაზიანებული." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "გასღების წაშლა ვერ მოხერხდა" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი." -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -143,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "შეიყვანეთ დისკის სახელი" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "მოათავსეთ დისკი დისკწამყვანში:" @@ -164,22 +164,22 @@ msgstr "" "პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და " "შემდეგ გააგრძელეთ." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 #, fuzzy msgid "A essential package would have to be removed" msgstr "A არსებითი -სკენ" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 #, fuzzy msgid "Could not calculate the upgrade" msgstr "არა" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -191,11 +191,11 @@ msgstr "" "ხარვეზი. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -205,23 +205,23 @@ msgstr "" "ბრაკი. იქნებ მოგვიანბით კიდევ ერთხელ სცადოთ. ქვევით იხილეთ არა-" "ავთენთიფიცერული პაკეტების სია." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "'%s' ვერ დაყენდა" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "მეტა-პაკეტი ვერ გამოვიცანით" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -252,11 +252,11 @@ msgstr "" msgid "Reading cache" msgstr "მიმდინარეობს ქეშის წაკითხვა" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -264,11 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "არავითარი გამოსადეგი სერვერის ანარეკლი" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -281,12 +281,12 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 #, fuzzy msgid "Generate default sources?" msgstr "გენერაცია ნაგულისხმევი?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,11 +295,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "რეპოზიტორიების ინფორმაცია არასწორეა" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -307,12 +307,12 @@ msgstr "" "რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ " "ხარვეზი." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 #, fuzzy msgid "Third party sources disabled" msgstr "გამორთული" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -320,11 +320,11 @@ msgid "" "synaptic." msgstr "-ში სია გამორთული თქვენ პარამეტრები ან." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "განახლებისას მოხდა შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "განახლებისას მოხდა შეცდომა. ეს როგროც წესი არის კავშირის პრობლემა, შეამოწმეთ " "თქვენი კავშირი და ცადეთ კიდევ ერთხელ." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -345,16 +345,16 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "გნებავთ განახლების დაწყება?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 #, fuzzy msgid "Could not install the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -364,50 +364,50 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "ახლა -ში A a." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 #, fuzzy msgid "Could not download the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 #, fuzzy msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "ახლა ან და " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "წავშალო მოძველებული პაკეტები?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "ნაბიჯის გა_მოტოვება" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_წაშლა" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 #, fuzzy msgid "Error during commit" msgstr "შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 #, fuzzy msgid "" "Some problem occured during the clean-up. Please see the below message for " @@ -415,31 +415,31 @@ msgid "" msgstr "-თვის ინფორმაცია " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "ვამოწმებ პროგრამულ მენეჯერს" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "რეპოზტორიის ინფორმაციის განახლება" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "გაფუჭებული პაკეტის შესახებ ინფორმაცია" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -449,21 +449,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 #, fuzzy msgid "Asking for confirmation" msgstr "-თვის" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "მიმდინარეობს განახლებების ჩაყენება" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 #, fuzzy msgid "Searching for obsolete software" msgstr "ვეძებ -თვის" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 #, fuzzy msgid "System upgrade is complete." msgstr "სისტემა ტოლია სრული." @@ -588,7 +588,7 @@ msgstr "ვის დახურვა ყველა გახსნა დ #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "თქვენი სისტემა განახლებულია" @@ -829,14 +829,14 @@ msgid "" "or with the server. " msgstr "მიმდენარეობს აუტენტიფიკაცია ვერ შედგა a ან " -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -880,8 +880,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "განახლებების _დაყენება" +msgid "Distribution updates" +msgstr "განახლება _გაგრძელება" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -896,86 +896,64 @@ msgstr "ვერსია %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "მიმდინარეობს ჩამოქაჩვა სია ის." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "შ_ემოწმება" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "ჩამოსატვირთის ზომა: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "განახლება გასრულებულია" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "განახლებების _დაყენება" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "ახალი ვერსია: %s (ზომა: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "ვერსია %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy msgid "" "You will not get any further security fixes or critical updates. Upgrade to " @@ -985,17 +963,17 @@ msgstr "" "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი " "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "პროგრამების სიის ინდექსი დაზიანებულია" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 #, fuzzy msgid "" "It is impossible to install or remove any software. Please use the package " @@ -1004,13 +982,35 @@ msgid "" msgstr "" "ტოლია -სკენ ან წაშლა ნებისმიერი Synaptic ან sudo -ში a ტერმინალი -სკენ." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 #, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big> თქვენ -თვის</big></b> n არა -თვის თქვენ -ში სისტემა ადმინისტრაცია " "პროგრამა პარამეტრები." @@ -1034,35 +1034,31 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big> გაშვება</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "ჩამოტვირთვის _გაუქმება" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "ცვლილებები" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "შე_მოწმება" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 #, fuzzy msgid "Check the software channels for new updates" msgstr "შემოწმება -თვის ახალი" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "აღწერილობა" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "ვერსიის მონაცემები" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1070,54 +1066,54 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 #, fuzzy msgid "Show progress of single files" msgstr "ჩვენება მიმდინარეობა ის ცალი" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "პროგრამული განახლებები" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "პროგრამა სწორეა და ახალი." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "Upgrade to the latest version of Ubuntu" msgstr "განახლება -სკენ ვერსია ის" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "შ_ემოწმება" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "განახლება _გაგრძელება" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_დამალე მომავალში მოცემული ინფორმაცია" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "განახლებების _დაყენება" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "ცვლილებები" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1152,81 +1148,86 @@ msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 #, fuzzy +msgid "Add Cdrom" +msgstr "დამატება" + +#: ../data/glade/SoftwareProperties.glade.h:10 +#, fuzzy msgid "Authentication" msgstr "აუთენტიფიკაცია" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "ჩამოტვირთული პაკეტების ფაილების წ_აშლა:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "ჩამოტვირთვა ტოლია სრული" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "იმპორტი გასაღები a" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "ინტერნეტ განახლებები" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "მხოლოდ" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "ნაგულისხმები პარამეტრები" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "ნაგულისხმევი ის დისტრიბუტივი" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "პროგრამა პარამეტრები" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "განახლებების ავტომატური შ_ემოწმება:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "ჩამოტვირთვა -ში არა" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "იმპორტი გასაღები ფაილი" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 #, fuzzy msgid "_Install security updates without confirmation" msgstr "დაყენება" @@ -1612,6 +1613,13 @@ msgid "Non-DFSG-compatible Software" msgstr "პროგრამა" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "განახლებების _დაყენება" + +#~ msgid "Cancel _Download" +#~ msgstr "ჩამოტვირთვის _გაუქმება" + +#, fuzzy #~ msgid "Some software no longer officially supported" #~ msgstr "არა" @@ -1690,10 +1698,6 @@ msgstr "პროგრამა" #~ msgstr "<b>გასაღებები</b>" #, fuzzy -#~ msgid "Add _Cdrom" -#~ msgstr "დამატება" - -#, fuzzy #~ msgid "Installation Media" #~ msgstr "დაყენება მედია" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl <darehanl@gmail.com>\n" "Language-Team: Korean <ko@li.org>\n" @@ -88,46 +88,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "소프트웨어 업데이트" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "키 가져오기" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "선택한 파일 가져오기 오류" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못된 것입니다." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "키 삭제 오류" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오." -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -138,11 +138,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "디스크에 사용할 이름을 입력하십시오." -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "드라이브에 디스크를 넣으십시오:" @@ -158,20 +158,20 @@ msgstr "" "이 소프트웨어로 수정할 수 없는 망가진 꾸러미가 있습니다. 진행 전에 먼저 시냅" "틱이나 apt-get을 사용하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "요청된 메타 꾸러미를 업그레이드 할 수 없습니다" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "필수 꾸러미를 지워야만 합니다." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -183,11 +183,11 @@ msgstr "" "버그를 보고하여 주십시오. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "꾸러미 인증 오류" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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,23 +196,23 @@ msgstr "" "인증하는데 실패한 꾸러미가 있습니다. 일시적인 네트워크 문제일 수 있으니 나중" "에 다시 시도하십시오. 인증에 실패한 꾸러미의 목록은 다음과 같습니다." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "'%s'을(를) 설치할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "요청된 꾸러미를 설치할 수 없습니다. 버그로 보고하여 주십시오. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "메타 꾸러미를 추측할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -245,11 +245,11 @@ msgstr "" msgid "Reading cache" msgstr "캐시를 읽는 중" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -257,11 +257,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "적합한 미러 서버를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -281,11 +281,11 @@ msgstr "" "'아니오'를 고르면 업데이트가 취소됩니다." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "기본 설정된 소스 목록을 만듭니까?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, 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:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "저장소 정보가 올바르지 않습니다" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -310,11 +310,11 @@ msgstr "" "저장소 정보를 업그레이드하는 것이 잘못된 파일로 만들어졌습니다. 버그를 보고하" "여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "써드 파티 소스는 이용할 수 없습니다" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -325,11 +325,11 @@ msgstr "" "properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하게 할 수 있습" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "업데이트 중 오류" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -337,11 +337,11 @@ msgstr "" "업데이트를 하는 동안에 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많습" "니다. 네트워크의 연결 상태를 확인하시고 다시 시도하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "디스크 여유 공간이 충분하지 않습니다." -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -353,15 +353,15 @@ msgstr "" "에 사용했던 임시 꾸러미들을 삭제하시기 바랍니다." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "업그레이드를 설치하지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -373,11 +373,11 @@ msgstr "" "업그레이드가 중지되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. " "(dpkg --configure -a)를 실행하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "업그레이드 파일을 다운로드 할 수 없습니다." -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -385,17 +385,17 @@ msgstr "" "업그레이드가 중지되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도" "하십시오. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "이 소프트웨어들은 더 이상 공식적으로 지원하지 않으며, 이제 Universe 계열에 해" @@ -404,23 +404,23 @@ msgstr "" "'Universe' 저장소를 활성화하지 않았다면 다음 단계에서 이 꾸러미들을 삭제할 " "수 있습니다. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "못쓰게 된 꾸러미를 삭제하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "이 단계 건너뛰기(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "삭제(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "커밋 도중 오류 발생" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -429,31 +429,31 @@ msgstr "" "보를 얻으실 수 있습니다. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "시스템을 원상태로 복구하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "꾸러미 관리자 확인 중" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "저장소 정보 업데이트 중" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "잘못된 꾸러미 정보" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -466,19 +466,19 @@ msgstr "" "다.\n" "심각한 오류입니다. 버그를 보고하여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "확인을 요청하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "업그레이드 하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "못 쓰게 된 소프트웨어를 검색하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "시스템 업그레이드가 끝났습니다." @@ -604,7 +604,7 @@ msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문 #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "시스템이 최신의 상태입니다." @@ -843,15 +843,15 @@ msgstr "" "업그레이드를 인증하는데 실패했습니다.네트워크나 서버에 문제가 있을 수 있습니" "다. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -892,8 +892,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "업데이트를 설치(_I)" +msgid "Distribution updates" +msgstr "업그레이드 계속(_R)" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -907,86 +907,65 @@ msgid "Version %s: \n" msgstr "버전 %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "바뀐 목록을 다운로드 하는 중..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "점검(_C)" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "다운로드 크기: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "업데이트가 끝났습니다." -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "업데이트를 설치(_I)" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "새 버전: %s (크기: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "버전 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "더 이상 지원되지 않는 배포판입니다." -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -996,17 +975,17 @@ msgstr "" "그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에" "서 보실 수 있습니다." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>새 배포판 '%s'를 이용할 수 있습니다</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "소프트웨어 목록이 망가졌습니다." -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1015,12 +994,35 @@ msgstr "" "어떤 소프트웨어도 설치하거나 삭제할 수 없습니다. \"시냅틱\"이나 터미널에서 " "\"sudo apt-get install -f\"를 실행하여 이 문제를 먼저 해결하십시오." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>수동으로 업데이트를 확인해야 합니다.</big></b>\n" "\n" @@ -1045,34 +1047,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>업그레이드를 시작하시겠습니까?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "다운로드 취소(_D)" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "변경 사항" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "점검(_k)" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "새로운 업데이트를 위해 소프트웨어 채널을 확인합니다." -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "설명" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "릴리즈 정보" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1080,15 +1078,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "각 파일의 진행 상황 표시" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "소프트웨어 업데이트" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1096,37 +1094,37 @@ msgstr "" "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" "합니다." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "업그레이드(_p)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "우분투 최신 버젼으로 업그레이드 합니다." -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "점검(_C)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "업그레이드 계속(_R)" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "앞으로 이 정보 숨김(_H)" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "업데이트를 설치(_I)" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "변경 사항" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1160,76 +1158,81 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "CD롬 추가(_C)" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "인증" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "다운로드 받은 소프트웨어 파일 삭제(_e):" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "다운로드가 끝났습니다." -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "믿을 만한 소프트웨어 제공자로부터 공개 키를 가져옵니다." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "인터넷 업데이트" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "공식 우분투 서버의 보안 업데이트만 자동으로 설치됩니다." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "기본값 불러오기(_D)" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "배포판의 기본 키 불러오기" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "소프트웨어 설정" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "업데이트를 자동으로 확인(_C):" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "백그라운드에서 업데이트 다운로드하되, 설치는 하지 않음(_D)" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "키 가져오기(_I)" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "확인없이 보안 업데이트 설치(_I)" @@ -1615,6 +1618,16 @@ msgstr "DFSG 호환이지만 자유소프트웨어가 아닌 의존성이 있는 msgid "Non-DFSG-compatible Software" msgstr "DFSG와 호환이 안되는 소프트웨어" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "업데이트를 설치(_I)" + +#~ msgid "Cancel _Download" +#~ msgstr "다운로드 취소(_D)" + #~ msgid "Some software no longer officially supported" #~ msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." @@ -1701,9 +1714,6 @@ msgstr "DFSG와 호환이 안되는 소프트웨어" #~ msgid "<b>Keys</b>" #~ msgstr "<b>키</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "CD롬 추가(_C)" - #~ msgid "Installation Media" #~ msgstr "설치 미디어" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: Kurdish <ku@li.org>\n" @@ -88,45 +88,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -134,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -152,20 +152,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -174,34 +174,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Nikarî '%s' saz bike" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +228,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,77 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Jê bibe" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -411,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Tê bilindkirin" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Bilindkirina sîstemê temam bû." @@ -545,7 +545,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Sîstema te rojane ye" @@ -769,14 +769,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -813,7 +813,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -827,114 +827,114 @@ msgid "Version %s: \n" msgstr "Guhertoya %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Mezinahiya daxistinê: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Rojanekirin temam bû" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Guhertoya nû: %s (Mezinahî: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Guhertoya %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -951,34 +951,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Dest bi bilindkirinê were kirin?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Daxistinê _betal bike" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Guhartin" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Daxuyanî" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -986,50 +982,50 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Guhartin" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1062,75 +1058,79 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 +msgid "D_elete downloaded software files:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Daxistin hatiye temam kirin" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Taybetmendiyên Nivîsbariyê" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1488,6 +1488,9 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Cancel _Download" +#~ msgstr "Daxistinê _betal bike" + #~ msgid "Your system has already been upgraded." #~ msgstr "Sîstema xwe berê hat bilindkirin." @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -88,47 +88,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Programinės įrangos atnaujinimai" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importuoti raktą" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Importuojant pasirinktą failą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Įveskite disko pavadinimą" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Įdėkite diską į įrenginį:" @@ -160,20 +160,20 @@ msgstr "" "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi „synaptic“ " "arba „apt-get“." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Negalima atnaujinti reikiamų metapaketų" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Nepavyko paskaičiuoti atnaujinimo" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -185,11 +185,11 @@ msgstr "" "tai kaip klaidą. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Klaida autentikuojant keletą paketų" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 "" "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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,12 +211,12 @@ msgstr "" "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 #, fuzzy msgid "Can't guess meta-package" msgstr "Negalima nuspėti meta paketo" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -250,11 +250,11 @@ msgstr "" msgid "Reading cache" msgstr "Nuskaitoma talpykla" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -262,12 +262,12 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 #, fuzzy msgid "No valid mirror found" msgstr "Nerasta tinkamo įrašo" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -280,11 +280,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Ar sukurti numatytųjų šaltinių sąrašą?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -293,11 +293,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Saugyklų informacija netinkama" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -305,11 +305,11 @@ msgstr "" "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. " "Praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Trečiųjų šalių šaltiniai išjungti" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -320,11 +320,11 @@ msgstr "" "Juos galėsite vėl įjungti, kai baigsite atnaujinimą su „programų savybių“ " "įrankiu arba „Synaptic“ paketų tvarkykle." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Klaida atnaujinant" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "Atnaujinant iškilo problema. Tai greičiausiai kokia nors tinklo problema, " "todėl iš naujo patikrinkite tinklo jungtis ir bandykite dar." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Diske nepakanka laisvos vietos" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -345,15 +345,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "At norite pradėti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Nepavyko įdiegti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -365,11 +365,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:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Nepavyko atsiųsti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -377,17 +377,17 @@ msgstr "" "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba įdiegimo " "laikmeną ir bandykite dar. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Šie įdiegti paketai nebėra oficialiai palaikomi. Dabar juos palaiko " @@ -396,23 +396,23 @@ msgstr "" "Jei nesate įjungę „universe“ skyriaus, šie paketai bus siūlomi pašalinimui " "kitame žingsnyje. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Pašalinti pasenusius paketus?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Praleisti šį žingsnį" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "P_ašalinti" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -421,31 +421,31 @@ msgstr "" "pranešime. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Perkraunama sistema" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Tikrinama paketų valdyklė" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Atnaujinama saugyklų informacija" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Netinkama paketo informacija" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -458,19 +458,19 @@ msgstr "" "paketo „%s“.\n" "Tai labai rimta problema, praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Klausiama patvirtinimo" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Atnaujinama" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Ieškoma pasenusios programinės įrangos" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Sistemos atnaujinimas baigtas." @@ -607,7 +607,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Jūsų sistema atnaujinta" @@ -850,15 +850,15 @@ msgstr "" "Nepavyko patvirtinti atnaujinimo autentiškumo. Gali būti tinklo arba " "serverio problema. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -898,8 +898,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Diegiami atnaujinimai" +msgid "Distribution updates" +msgstr "_Tęsti atnaujinimą" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -913,47 +913,26 @@ msgid "Version %s: \n" msgstr "Versija %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Atsiunčiamas pakeitimų sąrašas..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Patikrinti" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Atsiuntimo dydis: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -961,40 +940,40 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Palaukite, tai gali užtrukti." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Atnaujinimas užbaigtas" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Diegiami atnaujinimai" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nauja versija: %s (Dydis: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Jūsų distribucija daugiau nebepalaikoma" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +983,17 @@ msgstr "" "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie " "atnaujinimą rasite http://www.ubuntu.com ." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Programinės įrangos turinys sugadintas" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1024,13 +1003,35 @@ msgstr "" "pasinaudokite „Synaptic“ arba terminale įvykdykite komandą „sudo apt-get " "install -f“, norėdami ištaisyti šią problemą." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 #, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Jūs turite patikrinti dėl atnaujinimų rankiniu būdu</big></b>\n" "\n" @@ -1055,34 +1056,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Pradėti atnaujinimą?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Atšaukti _atsiuntimą" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Pakeitimai" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Ti_krinti" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Patikrinti programų kanalus dėl atnaujinimų" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Aprašymas" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Leidimo aprašymas" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1090,15 +1087,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Rodyti pavienių failų progresą" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Programinės įrangos atnaujinimai" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "" "Software updates correct errors, eliminate security vulnerabilities and " @@ -1107,37 +1104,37 @@ msgstr "" "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " "spragas bei suteikti naujas funkcijas." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "At_naujinti" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atnaujinti iki naujausios Ubuntu versijos" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Patikrinti" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Tęsti atnaujinimą" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Nerodyti šios informacijos ateityje" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "Į_diegti atnaujinimus" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Pakeitimai" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1171,27 +1168,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Pridėti _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autentikacija" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "Iš_trinti atsiųstus programinės įrangos failus:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Atsiųsta" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importuoti viešą raktą iš patikimo programinės įrangos tiekėjo" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internetiniai atnaujinimai" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "" "Only security updates from the official Ubuntu servers will be installed " @@ -1200,51 +1202,51 @@ msgstr "" "Tik saugumo atnaujinimai iš oficialių „Ubuntu“ serverių bus automatiškai " "įdiegti, todėl turi būti įdiegtas „unattended-upgrades“ programų paketas." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Atkurti _numatytuosius" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Atkurti _numatytuosius Jūsų distributyvui raktus" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Programinės įrangos šaltiniai" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Ieškoti atnaujinimų automatiškai:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Atsiųsti atnaujinimus fone, tačiau jų neįdiegti" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "Importuoti raktą" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "Į_diegti saugumo atnaujinimus neklausiant patvirtinimo" @@ -1633,6 +1635,16 @@ msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis msgid "Non-DFSG-compatible Software" msgstr "Su DFSG nesuderinama programinė įranga" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Diegiami atnaujinimai" + +#~ msgid "Cancel _Download" +#~ msgstr "Atšaukti _atsiuntimą" + #~ msgid "Some software no longer officially supported" #~ msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" @@ -1717,9 +1729,6 @@ msgstr "Su DFSG nesuderinama programinė įranga" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Raktai</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Pridėti _CD" - #~ msgid "Installation Media" #~ msgstr "Diegimo laikmenos" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n" "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n" @@ -89,51 +89,51 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Надградба на софтвер" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Изворен код" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Изворен код" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Грешка при увоз на избраната датотека" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Избраната датотека може да не е GPG датотека или пак може да е расипана." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -141,11 +141,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -159,20 +159,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -184,23 +184,23 @@ msgstr "" "како бубачка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -210,11 +210,11 @@ msgstr "" "како бубачка. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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 " @@ -241,11 +241,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -270,12 +270,12 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 #, fuzzy msgid "Generate default sources?" msgstr "Врати ги стандардните клучеви" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -284,43 +284,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "Грешка при отстранување на клучот" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -346,78 +346,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "Веќе работи друг менаџер за пакети" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -427,20 +427,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -565,7 +565,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "Вашиот систем е надграден!" @@ -797,14 +797,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -848,7 +848,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "Инсталирам надградби..." #. TRANSLATORS: updates from an 'unknown' origin @@ -864,46 +864,24 @@ msgstr "Верзија %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, fuzzy, python-format msgid "Download size: %s" msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -911,70 +889,92 @@ msgstr[0] "Инсталирам надградби..." msgstr[1] "Инсталирам надградби..." msgstr[2] "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Проверувам за надградби..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Верзија %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуција повеќе не е поддржана" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -990,34 +990,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Опис" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1025,51 +1021,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Надградба на софтвер" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "Инсталирам надградби..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1104,81 +1100,85 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +msgid "Add Cdrom" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Проверка" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Преземам промени" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Отстрани го избраниот клуч од доверливиот привезок." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>Надградби од интернет</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Врати стандардно" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Врати ги стандардните клучеви" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Софтверски својства" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Изворен код" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "Проверувај за надградби на секои" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1563,6 +1563,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Инсталирам надградби..." + +#, fuzzy #~ msgid "Important security updates of Ubuntu" #~ msgstr "Безбедносни надградби за Debian Stable" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux <azlinux@gmail.com>\n" "Language-Team: Malay <ms@li.org>\n" @@ -88,48 +88,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Kekunci impot" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Ralat semasa mengimpot fail yang dipilih" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Ralat semasa mengeluarkan kekunci" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -140,11 +140,11 @@ msgstr "" "↵\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Sila masukkan nama untuk cakera padat" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Sila masukkan cakera padat kedalam pemacu" @@ -161,20 +161,20 @@ msgstr "" "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-get " "sebelum meneruskan." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menjangka penaikkan taraf" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -186,23 +186,23 @@ msgstr "" "penaikkan. Sila laporkan ini sebagai ralat pepijat. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,11 +211,11 @@ msgstr "" "pepijat. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Pakej meta tidak dapat diduga." -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -248,11 +248,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -277,11 +277,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -290,21 +290,21 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Sumber ketiga tidak diaktifkan." -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -316,11 +316,11 @@ msgstr "" "selepas penaikkan taraf menggunakan alatan 'software-properties' ataupun " "'synaptic'." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Ralat semasa pengemaskinian." -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -329,11 +329,11 @@ msgstr "" "yang berkaitan dengan masaalah rangkaian, sila periksa dan cuba lagi " "sambungan rangkaian anda." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Muatak cakera keras tidak mencukupi." -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -345,15 +345,15 @@ msgstr "" "pemasangan sebelum ini menggunakan 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Anda mahu mulakan penaikkan taraf?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf." -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -365,11 +365,11 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sistem anda mungkin tidak stabil. " "Sistem 'recovery' telah dijalankan (dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai." -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -377,17 +377,17 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sila semak sambungan 'internet' atau " "media pemasangan anda dan cuba lagi. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Pakej-pakej yang telah dipasang ini sudah tidak ada sokonga/bantuan rasmi " @@ -395,54 +395,54 @@ msgstr "" "Jika anda tidak megaktifkan 'universe', pakej-pakej ini akan dicadangkan " "untuk dikeluarkan di peringkat selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Keluarkan pakej-pakej yang sudah luput?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -452,19 +452,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -585,7 +585,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -810,14 +810,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -854,7 +854,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -868,114 +868,114 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -999,34 +999,30 @@ msgstr "" "%s" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1034,49 +1030,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1108,73 +1104,77 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland <hanspb@bluezone.no>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -88,49 +88,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Programvareoppdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importer nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Feil under importering av valgt fil" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Kunne ikke fjerne nøkkelen" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -141,11 +141,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Vennligst oppgi et navn for platen" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Vennligst sett inn en plate i CD-spilleren:" @@ -162,20 +162,20 @@ msgstr "" "av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic eller " "apt-get før du fortsetter." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke oppgradere nødvendige meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -187,11 +187,11 @@ msgstr "" "rapporter dette som en feil. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Kunne ikke autentisere noen pakker" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -201,12 +201,12 @@ msgstr "" "nettverksproblem, så du bør prøve igjen senere. Se under for listen over " "pakker som ikke kunne autentiseres." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,11 +214,11 @@ msgstr "" "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Kan ikke gjette på meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -252,11 +252,11 @@ msgstr "" msgid "Reading cache" msgstr "Leser mellomlager" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -264,11 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Fant ikke noe gyldig speil" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -288,11 +288,11 @@ msgstr "" "Hvis du velger \"Nei\" vil oppgraderingen avbrytes." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Vil du opprette standardkilder?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -306,11 +306,11 @@ msgstr "" "Skal standard linjer for '%s' legges til? Hvis du velger 'Nei' vil " "oppdateringen avbrytes." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Ugyldig informasjon om arkiv" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -318,11 +318,11 @@ msgstr "" "Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst " "rapporter dette som en feil." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Tredjepartskilder er deaktivert" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -333,11 +333,11 @@ msgstr "" "aktivere dem etter oppgraderingen ved hjelp av verktøyet 'Egenskaper for " "programvare' eller med Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Feil under oppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -346,11 +346,11 @@ msgstr "" "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din " "og prøv igjen." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Ikke nok ledig diskplass" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -362,15 +362,15 @@ msgstr "" "bruke 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Ønsker du å starte oppgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Kunne ikke installere oppgraderingene" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -382,11 +382,11 @@ msgstr "" "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. En reperasjon " "ble forsøkt kjørt (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Kunne ikke laste ned alle oppgraderingene." -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -394,17 +394,17 @@ msgstr "" "Oppgraderingen avbrytes nå. Vennligst sjekk internet-tilkoblingen eller " "installasjonsmediet og prøv på nytt. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Disse installerte pakkene er ikke lenger offisielt støttet og er nå kun " @@ -413,23 +413,23 @@ msgstr "" "Hvis du ikke har 'universe' aktivert vil disse pakkene bli foreslått fjernet " "i neste steg. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Ønsker du å fjerne utdaterte pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Hopp over dette punktet" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Feil ved commit" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -438,31 +438,31 @@ msgstr "" "informasjon. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Gjenoppretter systemets originale tilstand" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Sjekker pakkehåndterer" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Oppdaterer informasjon om arkivet" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Ugyldig pakkeinformasjon" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -475,19 +475,19 @@ msgstr "" "pakken '%s'.\n" "Dette indikerer en alvorlig feil, vennligst rapportér denne feilen." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Spør om bekreftelse" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Oppgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Søker etter utdatert programvare" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Systemoppgraderingen er fullført" @@ -619,7 +619,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Systemet ditt er oppdatert!" @@ -862,15 +862,15 @@ msgstr "" "Autentiseringen av oppgraderingen feilet. Det kan være en feil med " "nettverket eller med tjeneren. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Laster ned filen %li av %li med %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Laster ned fil %li av %li ved ukjent hastighet" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Laster ned filen %li av %li med %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -912,8 +912,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Installerer oppdateringer" +msgid "Distribution updates" +msgstr "_Gjenoppta oppgradering" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -927,87 +927,66 @@ msgid "Version %s: \n" msgstr "Versjon %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Laster ned listen med endringer..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "Sjekk" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Nedlastingsstørrelse: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Vennligst vent, dette kan ta litt tid." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Oppdateringen er fullført" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Sjekker for tilgjengelige oppdateringer" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Ny versjon: %s (Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +996,17 @@ msgstr "" "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www." "ubuntu.com for mer informasjon om oppgradering." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Ny versjon \"%s\" er tilgjengelig</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Programvareoversikten er ødelagt." -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1037,12 +1016,35 @@ msgstr "" "pakkehåndteringsprogrammet \"Synaptic\" eller kjør kommandoen \"sudo apt-get " "install -f\" i en terminal for å løse denne situasjonen." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Du må sjekke for oppdateringer manuelt</big></b>\n" "\n" @@ -1067,34 +1069,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Vil du starte oppgraderingen?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Avbryt ne_dlasting" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Sjek_k" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Sjekk programvarekanalene for nye oppdateringer" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Utgivelsesinformasjon" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1102,15 +1100,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Vis fremdrift for enkeltfiler" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1118,37 +1116,37 @@ msgstr "" "Programvareoppdateringer fikser feil, fjerner sikkerhetshull og tilbyr ny " "funksjonalitet." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "O_ppgrader" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Oppgrader til siste versjon av Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "Sjekk" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Gjenoppta oppgradering" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "Skjul denne informasjonen i fremtiden" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Installerer oppdateringer" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1182,27 +1180,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Legg til _cdrom" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autentisering" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "Sl_ett nedlastede filer:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Nedlastingen er fullført" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importer den offentlige nøkkelen fra en tiltrodd programvareutgiver" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Oppdateringer fra Internett" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1210,51 +1213,51 @@ msgstr "" "Kun sikkerhetsoppdateringer fra de offisielle Ubuntu-tjenerne vil bli " "installert automatisk." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Gjenopprett stan_dardverdier" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Gjenopprett standardnøkler for din distribusjon" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Egenskaper for programvare" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Kilde" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Se etter oppdateringer automatisk:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Last ned oppdateringer i bakgrunnen, men ikke installér dem" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Importer fil med nøkler" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Installer sikkerhetsoppdateringer uten bekreftelse" @@ -1647,6 +1650,16 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter" msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel programvare" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Laster ned fil %li av %li ved ukjent hastighet" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Installerer oppdateringer" + +#~ msgid "Cancel _Download" +#~ msgstr "Avbryt ne_dlasting" + #~ msgid "Some software no longer officially supported" #~ msgstr "Noe programvare er ikke lenger offisielt støttet" @@ -1734,9 +1747,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Taster</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Legg til _cdrom" - #~ msgid "Installation Media" #~ msgstr "Installasjonsmedia" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -90,48 +90,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "सफ्टवेयर अद्यावधिकहरु" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "स्रोत" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "स्रोत" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -157,20 +157,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -180,23 +180,23 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -204,11 +204,11 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +235,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, 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:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -339,78 +339,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -420,20 +420,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "स्तरवृद्धि समाप्त" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -555,7 +555,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" @@ -785,14 +785,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -834,7 +834,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" #. TRANSLATORS: updates from an 'unknown' origin @@ -850,116 +850,116 @@ msgstr "संस्करण %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, fuzzy, python-format msgid "Download size: %s" msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै" msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "संस्करण %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "तपाईंको वितरण समर्थित छैन" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -975,34 +975,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "परिवर्तनहरु" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "बर्णन" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1010,51 +1006,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "सफ्टवेयर अद्यावधिकहरु" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "परिवर्तनहरु" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1090,81 +1086,86 @@ msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 #, fuzzy +msgid "Add Cdrom" +msgstr "सिडि थप्नुहोस" + +#: ../data/glade/SoftwareProperties.glade.h:10 +#, fuzzy msgid "Authentication" msgstr "प्रमाणिकरण" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "विश्वास गरिएको कुञ्जिरिंग बाट चयन गरिएको कुञ्जि हटाउनुहोस" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "सफ्टवेयर गुणहरु" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "स्रोत" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1551,6 +1552,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै" + +#, fuzzy #~ msgid "Your system has already been upgraded." #~ msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" @@ -1584,10 +1589,6 @@ msgstr "" #~ msgstr "<b>विवरणहरु</b>" #, fuzzy -#~ msgid "Add _Cdrom" -#~ msgstr "सिडि थप्नुहोस" - -#, fuzzy #~ msgid "Installation Media" #~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n" "Language-Team: Nederlands <vertaling@vrijschrift.org>\n" @@ -87,50 +87,50 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Software-updates" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Sleutel importeren" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Fout bij het importeren van het geselecteerde bestand." -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Fout bij het verwijderen van de sleutel" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -141,11 +141,11 @@ msgstr "" "↵\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Geef het cd-schijfje een naam" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Plaats een schijf in de speler:" @@ -162,20 +162,20 @@ msgstr "" "met deze software. Repareer deze eerst met synaptic of apt-get voordat u " "verder gaat." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Kan de vereiste meta-pakketten niet upgraden." -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Kan de vereisten voor de upgrade niet berekenen" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -187,11 +187,11 @@ msgstr "" "Gelieve dit als fout te rapporteren. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Fout bij het bepalen van de echtheid van sommige pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -202,12 +202,12 @@ msgstr "" "proberen. Hieronder vindt u een lijst met pakketten waarvan de echtheid niet " "vastgesteld is." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Kan '%s' niet installeren" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -216,11 +216,11 @@ msgstr "" "fout te rapporteren. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Kan het meta-pakket niet raden" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -255,11 +255,11 @@ msgstr "" msgid "Reading cache" msgstr "Tijdelijke opslag inlezen" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -267,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Geen geldige mirror-server gevonden" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -292,11 +292,11 @@ msgstr "" "Wanneer u 'Nee' kiest, zal de update worden geannuleerd." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "De standaard bronnenlijst genereren?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -310,11 +310,11 @@ msgstr "" "Moeten de standaardregels voor '%s' worden toegevoegd? Wanneer u 'Nee' " "kiest, zal de update worden geannuleerd." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "De informatie over de pakketbronnen is ongeldig" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -322,11 +322,11 @@ msgstr "" "Het upgraden van de informatie over de pakketbronnen heeft het bestand " "ongeldig gemaakt. Rapporteer dit als een fout." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Pakketbronnen van derden uitgeschakeld" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -337,11 +337,11 @@ msgstr "" "kunt ze na de upgrade weer inschakelen via het menu Systeem -> Beheer -> " "Software-eigenschappen of met het programma Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Fout tijdens het updaten" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -349,11 +349,11 @@ msgstr "" "Tijdens het updaten is er iets misgegaan. Dit komt meestal door " "netwerkproblemen. Controleer uw netwerkverbinding en probeer opnieuw." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Niet genoeg vrije schijfruimte" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -365,15 +365,15 @@ msgstr "" "vorige installaties via 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Wilt u beginnen met de upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Kon de upgrades niet installeren" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -386,11 +386,11 @@ msgstr "" "onbruikbare toestand. Er is een hersteloperatie uitgevoerd (dpkg --configure " "-a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Kon de upgrades niet downloaden" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -398,17 +398,17 @@ msgstr "" "De upgrade wordt nu afgebroken. Controleer uw internetverbinding of het " "installatiemedium en probeer opnieuw. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Deze geïnstalleerde pakketten worden niet meer officieel ondersteund, maar " @@ -417,23 +417,23 @@ msgstr "" "Indien 'universe' niet geactiveerd is zal bij de volgende stap gevraagd " "worden om deze pakketten te verwijderen. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Overbodige pakketten verwijderen?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Deze stap overslaan" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Verwijderen" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Fout bij het toepassen" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -442,31 +442,31 @@ msgstr "" "voor meer informatie. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "De oorspronkelijke toestand wordt hersteld" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Pakkettenbeheer controleren" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Updaten van de informatie over de pakketbronnen" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Ongeldige pakketinformatie" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -479,19 +479,19 @@ msgstr "" "meer gevonden worden.\n" "Dit is een ernstige fout, die gerapporteerd moet worden." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Vragen om bevestiging" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Bezig met upgraden" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Zoeken naar overbodige software" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Systeemupgrade is voltooid." @@ -626,7 +626,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Uw systeem is up-to-date" @@ -866,15 +866,15 @@ msgstr "" "De echtheidscontrole van de upgrade is mislukt. Er is mogelijk een probleem " "met het netwerk of de server. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Downloaden van bestand %li uit %li met %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Downloaden van bestand %li uit %li, snelheid onbekend" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Downloaden van bestand %li uit %li met %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -920,8 +920,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Up_dates installeren" +msgid "Distribution updates" +msgstr "_Upgrade hervatten" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -935,87 +935,66 @@ msgid "Version %s: \n" msgstr "Versie %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Het overzicht van de wijzigingen wordt gedownload..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Controleren" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Downloadgrootte: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Een ogenblik geduld, dit kan even duren." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "De update is voltooid" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Up_dates installeren" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nieuwe versie: %s (Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versie %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Uw distributie wordt niet langer ondersteund" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1025,17 +1004,17 @@ msgstr "" "upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu." "com voor meer informatie over upgraden." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Software-index is beschadigd" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1045,12 +1024,35 @@ msgstr "" "Gebruik het pakkettenbeheerprogramma \"Synaptic\" of gebruik \"sudo apt-get " "install -f\" in een terminalvenster om eerst dit probleem te verhelpen." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>U moet zelf controleren of er updates zijn</big></b>\n" "\n" @@ -1075,34 +1077,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Upgrade starten?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Download _annuleren" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Wijzigingen" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Controleren" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Controleer de softwarekanalen op nieuwe updates" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Omschrijving" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Versie-informatie" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1110,15 +1108,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Voortgang tonen van individuele pakketten" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Software-updates" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1126,37 +1124,37 @@ msgstr "" "Software-updates repareren fouten, verhelpen veiligheidsproblemen en leveren " "nieuwe mogelijkheden." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "U_pgraden" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade naar de nieuwste versie van Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Controleren" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Upgrade hervatten" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Deze informatie in het vervolg niet meer tonen" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "Up_dates installeren" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Wijzigingen" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1190,27 +1188,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "_CD-rom toevoegen" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Echtheidscontrole" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "Gedownloade softwarebestanden _verwijderen:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Downloaden is voltooid" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importeer de publieke sleutel van een vertrouwde softwareleverancier" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internet-updates" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1218,50 +1221,50 @@ msgstr "" "Alleen veiligheidsupdates van de officiële Ubuntu servers zullen automatisch " "geïnstalleerd worden" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "_Standaarden herstellen" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Herstel de standaard sleutels van uw distributie" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Software-eigenschappen" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Automatisch controleren op aanwezigheid van updates:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "Up_dates wel in de achtergrond downloaden, maar niet installeren" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "Sleutel i_mporteren" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Veiligheids-updates zonder te vragen installeren" @@ -1652,6 +1655,16 @@ msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden" msgid "Non-DFSG-compatible Software" msgstr "Software niet compatibel met DFSG" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Downloaden van bestand %li uit %li, snelheid onbekend" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Up_dates installeren" + +#~ msgid "Cancel _Download" +#~ msgstr "Download _annuleren" + #~ msgid "Some software no longer officially supported" #~ msgstr "Bepaalde software wordt niet meer officieel ondersteund" @@ -1740,9 +1753,6 @@ msgstr "Software niet compatibel met DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Sleutels</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "_CD-rom toevoegen" - #~ msgid "Installation Media" #~ msgstr "Installatiemedium" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola <terance@lyse.net>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -89,49 +89,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Programvareoppdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -157,20 +157,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -181,23 +181,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:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -206,11 +206,11 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +237,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -249,11 +249,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -266,11 +266,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -279,43 +279,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "Feil under fjerning av nøkkel" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -324,15 +324,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -341,78 +341,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -422,21 +422,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -558,7 +558,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "Systemet er helt oppdatert!" @@ -790,14 +790,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -839,7 +839,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "Installerer oppdateringer..." #. TRANSLATORS: updates from an 'unknown' origin @@ -855,116 +855,116 @@ msgstr "Versjon %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, fuzzy, python-format msgid "Download size: %s" msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -980,34 +980,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1015,51 +1011,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "Installerer oppdateringer..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1094,81 +1090,86 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Legg til _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autentisering" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Laster ned endringer" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>Oppdateringer fra Internett</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Gjenopprettt forvalgte nøkler" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Gjenopprettt forvalgte nøkler" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Egenskaper for programvare" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Kilde" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "Installerer oppdateringer..." -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1555,6 +1556,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Installerer oppdateringer..." + +#, fuzzy #~ msgid "Your system has already been upgraded." #~ msgstr "Systemet har ødelagte pakker!" @@ -1588,10 +1593,6 @@ msgstr "" #~ msgstr "<b>Detaljer</b>" #, fuzzy -#~ msgid "Add _Cdrom" -#~ msgstr "Legg til _CD" - -#, fuzzy #~ msgid "Installation Media" #~ msgstr "Installerer oppdateringer..." @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova." "com>\n" @@ -89,48 +89,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importar clau" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Error al moment d'importar lo fichièr seleccionat" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Error al moment de suprimir la clau" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -141,11 +141,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Picatz un nom pel disc" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Metètz un disc dins lo legidor :" @@ -159,20 +159,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Impossible calcular la mesa a jorn" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -181,34 +181,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Impossible installar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +235,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -277,42 +277,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Error al moment de metre a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Pas pro d'espaci liure" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Volètz començar la mesa a jorn ?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Impossible installar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -338,77 +338,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Impossible descargar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Suprimir" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -418,19 +418,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Mesa a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "La mesa a jorn del sistèma es acabada." @@ -551,7 +551,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -776,14 +776,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -821,7 +821,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "<b>Mesas a jorn per internet</b>" #. TRANSLATORS: updates from an 'unknown' origin @@ -836,116 +836,116 @@ msgid "Version %s: \n" msgstr "Version %s : \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Verificar" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Talha de la descarga : %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "<b>Mesas a jorn per internet</b>" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -969,34 +969,30 @@ msgstr "" "%s" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambis" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Descripcion" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1004,50 +1000,50 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Cambis" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1081,74 +1077,79 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Apondre un CD-ROM" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Talha de la descarga : %s" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1511,15 +1512,16 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "<b>Mesas a jorn per internet</b>" + +#, fuzzy #~ msgid "Updates of Ubuntu" #~ msgstr "Metre a jorn Ubuntu" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Claus</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Apondre un CD-ROM" - #~ msgid " " #~ msgstr " " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n" "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n" @@ -89,46 +89,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -136,11 +136,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -154,20 +154,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -176,34 +176,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +230,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -272,42 +272,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -333,77 +333,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -413,20 +413,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -547,7 +547,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -775,14 +775,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -822,8 +822,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." +msgid "Distribution updates" +msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -837,115 +837,115 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -961,34 +961,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -996,53 +992,53 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 #, fuzzy msgid "Software Updates" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "U_pgrade" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1077,76 +1073,81 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "_CD ਸ਼ਾਮਲ" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "ਪ੍ਰਮਾਣਿਕਤਾ" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Download from:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1499,6 +1500,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + +#, fuzzy #~ msgid "Important security updates of Ubuntu" #~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" @@ -1519,10 +1524,6 @@ msgstr "" #~ msgstr "<b>ਵੇਰਵਾ</b>" #, fuzzy -#~ msgid "Add _Cdrom" -#~ msgstr "_CD ਸ਼ਾਮਲ" - -#, fuzzy #~ msgid "Installation Media" #~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n" "Language-Team: Polish <translators@gnomepl.org>\n" @@ -88,48 +88,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Aktualizacje oprogramowania" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Źródłowy" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Źródłowy" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Zaimportuj klucz" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Błąd podczas importowania wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -140,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Proszę podać nazwę dla płyty" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Proszę włożyć płytę do napędu:" @@ -161,20 +161,20 @@ msgstr "" "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub " "apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Nie można zaktualizować wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -186,11 +186,11 @@ msgstr "" "zgłosić to jako błąd. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Błąd podczas uwierzytelniania niektórych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -200,23 +200,23 @@ msgstr "" "sieci. Można spróbować ponownie później. Poniżej znajduje się lista " "nieuwierzytelnionych pakietów." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Nie można zainstalować \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 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:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -248,11 +248,11 @@ msgstr "" msgid "Reading cache" msgstr "Odczytywanie bufora podręcznego" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Nie odnaleziono poprawnego serwera lustrzanego" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -284,11 +284,11 @@ msgstr "" "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Wygenerować domyślne źródła?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -302,11 +302,11 @@ msgstr "" "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" " "aktualizacja zostanie anulowana." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Błędne informacje o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -314,11 +314,11 @@ msgstr "" "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę " "zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Źródła stron niezależnych zostały wyłączone" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -329,11 +329,11 @@ msgstr "" "włączyć po aktualizacji używając narzędzia \"Właściwości oprogramowania\" " "lub za pomocą Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Błąd podczas aktualizacji" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Zbyt mało miejsca na dysku" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +357,15 @@ msgstr "" "\"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Czy chcesz rozpocząć aktualizację?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem." -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -378,11 +378,11 @@ msgstr "" "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Pobranie aktualizacji było niemożliwe" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -390,17 +390,17 @@ msgstr "" "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz " "dysk instalacyjny i spróbować ponownie. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Te zainstalowane pakiety nie są już oficjalnie wspierane, są teraz " @@ -409,23 +409,23 @@ msgstr "" "Jeśli nie masz włączonego \"universe\" w następnym kroku zostanie " "zasugerowane ich usunięcie. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Usunąć niepotrzebne pakiety?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Pomiń ten krok" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Usuń" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Błąd podczas zatwierdzania" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,31 +434,31 @@ msgstr "" "poniższych wiadomościach. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Przywracanie pierwotnego stanu systemu" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Sprawdzanie menedżera pakietów" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Aktualizowanie informacji o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Błędne informacje o pakietach" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -471,19 +471,19 @@ msgstr "" "być odnaleziony.\n" "To wskazuje na poważny problem, proszę zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Pytanie o potwierdzenie" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Aktualizacja w toku" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Aktualizacja systemu zakończona powodzeniem." @@ -619,7 +619,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Twój system jest w pełni zaktualizowany" @@ -860,15 +860,15 @@ msgstr "" "Uwierzytelnienie aktualizacji nie powiodło się. To może być problem sieciowy " "lub z serwerem. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Pobieranie pliku %li z %li z prędkością %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Pobieranie pliku %li z %li z prędkością %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -910,8 +910,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Instalowanie pakietów" +msgid "Distribution updates" +msgstr "_Wznów aktualizację" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -925,47 +925,26 @@ msgid "Version %s: \n" msgstr "Wersja %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Pobieranie informacji o zmianach..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "Sp_rawdź" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Rozmiar do pobrania: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -973,40 +952,40 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s" msgstr[1] "Ilość dostępnych aktualizacji: %s" msgstr[2] "Ilość dostępnych aktualizacji: %s" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Proszę czekać, to może chwilę potrwać." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Aktualizacja została ukończona." -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Sprawdź dostępne aktualizacje" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nowa wersja: %s (Rozmiar: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Wersja %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Twoja dystrybucja nie jest już wspierana" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1016,17 +995,17 @@ msgstr "" "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. " "Odwiedź http://www.ubuntu.com po więcej informacji." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Spis oprogramowania jest uszkodzony" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1036,12 +1015,35 @@ msgstr "" "Proszę użyć \"Synaptic Menedżer Pakietów\" lub wydać polecenie \"sudo apt-" "get install -f\" w terminalu, aby naprawić ten problem." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Wymagane jest ręczne sprawdzenie dostępności aktualizacji</big></b>\n" "\n" @@ -1067,34 +1069,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Rozpocząć aktualizację?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "_Przerwij pobieranie" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Zmiany" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Sp_rawdź" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Sprawdź kanały oprogramowania w poszukiwaniu nowych aktualizacji" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Opis" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Informacje o wydaniu" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1102,15 +1100,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Pokaż postęp pobierania poszczególnych plików" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Aktualizacje oprogramowania" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1118,37 +1116,37 @@ msgstr "" "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " "bezpieczeństwa i dostarczyć nowe funkcje." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Aktualizuj" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Zaktualizuj do najnowszej wersji Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "Sp_rawdź" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Wznów aktualizację" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Ukryj tę informację w przyszłości" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Instaluj aktualizacje" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Zmiany" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1182,27 +1180,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Dodaj płytę _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Uwierzytelnianie" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Usuń pobrane pliki oprogramowania:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Pobieranie zostało zakończone." -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Zaimportuj publiczny klucz od zaufanego dostawcy oprogramowania" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Aktualizacje internetowe" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1210,51 +1213,51 @@ msgstr "" "Aktualizacje zabezpieczeń zostaną zainstalowane automatycznie wyłącznie z " "oficjalnych serwerów Ubuntu" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Przywróć _domyślne klucze" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Przywróć domyślne klucze dystrybucji" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Oprogramowanie" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Źródłowy" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Sprawdzaj dostępność aktualizacji automatycznie:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Pobieraj aktualizacje w tle, ale ich nie instaluj" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "Za_importuj klucz" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Instaluj aktualizacje bezpieczeństwa bez potwierdzania" @@ -1646,6 +1649,16 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free" msgid "Non-DFSG-compatible Software" msgstr "Oprogramowanie niekompatybilne z DFSG." +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Instalowanie pakietów" + +#~ msgid "Cancel _Download" +#~ msgstr "_Przerwij pobieranie" + #~ msgid "Some software no longer officially supported" #~ msgstr "Niektóre programy nie są już oficjalnie wspierane" @@ -1735,9 +1748,6 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "<b>Keys</b>" #~ msgstr "<b>Klucze</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Dodaj płytę _CD" - #~ msgid "Installation Media" #~ msgstr "Nośnik instalacji" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho <latrine@gmail.com>\n" "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n" @@ -86,49 +86,49 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Actualizações de Software" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importar chave" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Erro ao importar ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Erro ao remover a chave" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -139,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Por favor introduza um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" @@ -160,20 +160,20 @@ msgstr "" "este software. Por favor corrija-os usando o synaptic ou apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível actualizar os meta-pacotes necessários" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Impossível de calcular a actualização" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -185,11 +185,11 @@ msgstr "" "reporte este erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -199,12 +199,12 @@ msgstr "" "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma " "lista de pacotes não autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Impossível de instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,11 +212,11 @@ msgstr "" "Foi impossível instalar um pacote essencial. Por favor reporte este erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Impossível de descobrir meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -250,11 +250,11 @@ msgstr "" msgid "Reading cache" msgstr "A ler a cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -262,11 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrada" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -287,11 +287,11 @@ msgstr "" "Se escolher \"não\" a actualização irá ser cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Gerar as fontes padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -305,11 +305,11 @@ msgstr "" "Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a " "actualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -317,11 +317,11 @@ msgstr "" "A actualização da informação de repositório resultou num ficheiro inválido. " "Por favor reporte este erro." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Fontes de terceiros desactivadas" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -332,11 +332,11 @@ msgstr "" "reactivá-las depois da actualização com a ferramenta 'propriedades-software' " "ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Erro durante a actualização" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -345,11 +345,11 @@ msgstr "" "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a " "tentar." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Não existe espaço livre em disco suficiente" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -361,15 +361,15 @@ msgstr "" "usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Deseja iniciar a actualização?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Impossível de instalar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -381,11 +381,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:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Impossível de descarregar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -393,17 +393,17 @@ 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:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Estes pacotes instalados já não são suportados oficialmente, e agora são " @@ -412,23 +412,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:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Saltar Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Erro ao submeter" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -437,32 +437,32 @@ msgstr "" "abaixo para mais informação. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 #, fuzzy msgid "Restoring original system state" msgstr "A restaurar o estado original do sistema" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "A verificar gestor de pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "A Actualizar informação de repositórios" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Informação de pacotes inválida" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -475,19 +475,19 @@ msgstr "" "pacote essencial '%s'.\n" "Isto indica um erro sério, por favor reporte este problema." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "A pedir confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "A actualizar" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "À procura de software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "A actualização do sistema está completa." @@ -621,7 +621,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado" @@ -860,15 +860,15 @@ msgstr "" "Autenticação da actualização falhou. Poderá existir um problema com a rede " "ou com o servidor. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "A descarregar ficheiro %li de %li a %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "A descarregar ficheiro %li de %li a %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -912,8 +912,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "A instalar actualizações" +msgid "Distribution updates" +msgstr "_Retomar Actualização?" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -927,87 +927,66 @@ msgid "Version %s: \n" msgstr "Versão %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "A descarregar lista de alterações..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Verificar" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Por favor aguarde, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "A actualização está completa" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Verificar por actualizações disponíveis" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nova versão: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versão %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "A sua distribuição já não é suportada" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +996,17 @@ msgstr "" "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais " "informação em como actualizar." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "O índice de software está quebrado" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1037,12 +1016,35 @@ msgstr "" "gestor de pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" numa " "consola para corrigir este problema em primeiro lugar." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Tem de verificar por actualizações manualmente</big></b>\n" "\n" @@ -1068,34 +1070,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Iniciar a actualização?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Cancelar _Descarregamento" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Alterações" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "Verific_ar" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Verificar os repositórios de software por novas actualizações" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Descrição" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Notas de lançamento" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1103,15 +1101,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Mostrar progresso de ficheiros individuais" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Actualizações de Software" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1119,37 +1117,37 @@ msgstr "" "Actualizações de software podem corrigir erros, eliminar problemas de " "segurança, e fornecer novas funcionalidades." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "A_ctualização" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualize para a última versão do Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Retomar Actualização?" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Instalar Actualizações" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Alterações" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1183,27 +1181,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Adicionar _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autenticação" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "A_pagar ficheiros descarregados:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "O Download está completo" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importar a chave pública de um fornecedor de software confiável" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Actualizações Internet" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1211,50 +1214,50 @@ msgstr "" "Apenas actualizações de segurança dos servidores oficiais do Ubuntu serão " "instaladas automaticamente." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Restaurar _Definições" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Restaurar as chaves padrão da sua distribuição" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Preferências de Software" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Procurar por actualizações automaticamente:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Descarregar actualizações silenciosamente, sem as instalar" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Importar Chave de Ficheiro" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Instalar actualizações de segurança sem confirmação" @@ -1646,6 +1649,16 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres" msgid "Non-DFSG-compatible Software" msgstr "Software compatível-DFSG" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "A instalar actualizações" + +#~ msgid "Cancel _Download" +#~ msgstr "Cancelar _Descarregamento" + #~ msgid "Some software no longer officially supported" #~ msgstr "Algum software já não é suportado oficialmente" @@ -1734,9 +1747,6 @@ msgstr "Software compatível-DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Chaves</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Adicionar _CD" - #~ msgid "Installation Media" #~ msgstr "Media de Instalação" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2a927beb..fe604df0 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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut <ubuntu@kurtkraut.net>\n" "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n" @@ -87,52 +87,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Modificando os canais de programas" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importar Chave" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Erro importando o arquivo selecionado" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Erro removendo a chave" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -143,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Por favor digite um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" @@ -164,20 +164,20 @@ msgstr "" "programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes " "de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível atualizar os meta-pacotes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -189,11 +189,11 @@ msgstr "" "favor reporte isto como um erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -203,12 +203,12 @@ msgstr "" "de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes " "não-autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,11 +217,11 @@ msgstr "" "um erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Não foi possível adivinhar o meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -255,11 +255,11 @@ msgstr "" msgid "Reading cache" msgstr "Lendo cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -267,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrado" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -291,11 +291,11 @@ msgstr "" "Se você selecionar 'não' a atualização será cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Gerar sources padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -309,11 +309,11 @@ msgstr "" "Entradas padrões para '%s' devem ser adicionadas? Se você escolher 'Não' a " "atualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -321,11 +321,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:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Fontes de terceiros desabilitadas" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -336,11 +336,11 @@ msgstr "" "poderá reabilitá-las depois de atualizar com a ferramenta 'propriedades do " "programa' ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Erro durante a atualização" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -349,11 +349,11 @@ msgstr "" "problemas de rede, por favor verifique a sua conexão de rede e tente " "novamente." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Não há espaço suficiente no disco" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -365,15 +365,15 @@ msgstr "" "instalações anteriores usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Você quer iniciar a atualização?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Não foi possível instalar as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -385,11 +385,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:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Não foi possível obter as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -397,17 +397,17 @@ 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:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Estes pacotes já instalados não são mais oficialmente suportados, e agora " @@ -416,23 +416,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:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Pular Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Erro ao aplicar as mudanças" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -441,32 +441,32 @@ msgstr "" "abaixo para maiores informações. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Reiniciando o estado original do sistema" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Verificando o Gerenciador de Pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 #, fuzzy msgid "Invalid package information" msgstr "Informação do pacote inválida" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -479,19 +479,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:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Pedindi por confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Atualizando" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "A Atualização do Sistema está completa." @@ -622,7 +622,7 @@ msgstr "Para evitar perda de dados, feche todas as aplicações e documentos." #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Seu sistema está atualizado" @@ -863,15 +863,15 @@ msgstr "" "Falha ao autenticar a atualização. Pode ter havido um problema com a rede ou " "com o servidor. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Obtendo arquivo %li de %li a %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Obtendo arquivo %li de %li a %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -917,8 +917,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Instalando Atualizações" +msgid "Distribution updates" +msgstr "Continua_r Atualização" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -932,87 +932,66 @@ msgid "Version %s: \n" msgstr "Version %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Obtendo a lista de alterações" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Verificar" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Por favor, espere, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Atualização completa" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Procurar updates disponíveis" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "New version: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Sua distribuição não é mais suportada" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1022,17 +1001,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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "A índex de software está quebrado" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1042,12 +1021,35 @@ msgstr "" "Gerenciador de Pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" " "em um terminal para resolver esse problema primeiro." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Você deve verificar as atualizações manualmente</big></b>\n" "\n" @@ -1073,34 +1075,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Iniciar a Atualização?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Cancelar _Download" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Mudanças" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Verificar os canais de software por novas atualizações" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Descrição" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Notas de Versão" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1108,15 +1106,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Exibir progresso de arquivos únicos" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Atualizações de Programas" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1124,38 +1122,38 @@ msgstr "" "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " "segurança, e prover novas funcionalidades para você." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "U_pgrade" msgstr "At_ualizar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atualizar para a última versão do Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "Continua_r Atualização" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Instalar Atualizações" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Mudanças" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1189,27 +1187,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Adicionar _Cdrom" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autenticação" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "Apagar arquivos d_e programas obtidos:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "O Download está completo" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importar a chave pública de um fornecedor de programas confiável" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Atualizações via Internet" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1217,52 +1220,52 @@ msgstr "" "Somente atualizações de segurança do servidor oficial do Ubuntu serão " "instaladas automaticamente." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurar Pa_drões" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Restaurar as chaves padrão da sua distribuição" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Software Properties" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Source" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "Verifi_car por atualizações automaticamente:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Obter atualizações em segundo plano, mas não instalá-las" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_Importar Arquivo Chave" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Instalar novas atualizações de segurança sem confirmação" @@ -1655,6 +1658,16 @@ 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 "Downloading file %li of %li with unknown speed" +#~ msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Instalando Atualizações" + +#~ msgid "Cancel _Download" +#~ msgstr "Cancelar _Download" + #~ msgid "Some software no longer officially supported" #~ msgstr "Alguns softwares não são mais oficialmente suportado." @@ -1743,9 +1756,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Chaves</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Adicionar _Cdrom" - #~ msgid "Installation Media" #~ msgstr "Mídia de Instalação" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA <spotirca@gmail.com>\n" "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n" @@ -88,53 +88,53 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Actualizări software" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "" "Binar\n" "Sursă" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "" "Binar\n" "Sursă" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 #, fuzzy msgid "Import key" msgstr "Importă cheie" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Eroare la importarea fişierului selectat" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Eroare la ştergerea cheii." -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -145,11 +145,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Introduceţi un nume pentru disc" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Introduceţi un disc în unitate:" @@ -168,20 +168,20 @@ msgstr "" "program. Înainte de a continua vă rugăm să le remediaţi utilizând synaptic " "sau apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -190,24 +190,24 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 #, fuzzy msgid "Error authenticating some packages" msgstr "Eroare la autentificarea unor pachete." -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Nu pot instala '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -217,11 +217,11 @@ msgstr "" "(eroare). " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -253,11 +253,11 @@ msgstr "" msgid "Reading cache" msgstr "Citire cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -265,11 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -282,11 +282,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,42 +295,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Eroare în timpul actualizării" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Spaţiu liber insuficient" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -339,15 +339,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Vrei sa începi upgrade-ul?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Nu s-au putut instalat upgrade-urile" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -356,78 +356,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Nu pot descărca actualizările" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "Şter_ge" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 #, fuzzy msgid "Restoring original system state" msgstr "Se reface starea iniţială a sistemului" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Se verifică managerul de pachete" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -437,19 +437,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Se actualizează" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Actualizarea sistemului este completă" @@ -570,7 +570,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Sistemul dumneavoastră este actualizat la zi!" @@ -797,14 +797,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -848,8 +848,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_Instalează actualizarile" +msgid "Distribution updates" +msgstr "_Continuă Actualizarea" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -864,46 +864,24 @@ msgstr "Versiunea %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Se descarcă listă schimbărilor..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -911,70 +889,92 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_Instalează actualizarile" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Versiunea nouă: %s (Mărime: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Versiunea %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Distribuţia dvs. nu mai este suportată" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -998,34 +998,30 @@ msgstr "" "%s" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Modificări" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Descriere" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1033,53 +1029,53 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Actualizări software" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "U_pgrade" msgstr "_Actualizează" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Continuă Actualizarea" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "_Instalează actualizarile" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Modificări" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1113,80 +1109,84 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +msgid "Add Cdrom" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autentificare" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Download from:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Elimină cheia selectată din keyring-ul de încredere." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Actualizări de pe Internet" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurează cheile implicite." -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Preferinţe software" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "" "Binar\n" "Sursă" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "Importă cheie" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1570,6 +1570,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_Instalează actualizarile" + #~ msgid "Could not find any upgrades" #~ msgstr "Nu s-au găsit actualizări" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -89,47 +89,47 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Обновления программ" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Импортировать ключ" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Ошибка при импортировании выбранного файла" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Возможно выбранный файл не является файлом ключа GPG или поврежден." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Ошибка при удалении ключа" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке." -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -140,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Введите название для диска" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Пожалуйста, вставьте диск в привод:" @@ -161,20 +161,20 @@ msgstr "" "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-get, " "прежде чем продолжить." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Невозможно обновить требуемые мета-пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "Будет удален необходимый пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Невозможно подготовить обновление системы" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -186,11 +186,11 @@ msgstr "" "Пожалуйста, отправьте отчет об ошибке. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Ошибка при проверке подлинности некоторых пакетов" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -200,12 +200,12 @@ msgstr "" "кратковременная проблема с сетью и стоит попробовать позже. Ниже приведен " "список пакетов, не прошедших проверку." -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Невозможно установить '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,11 +214,11 @@ msgstr "" "ошибке. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Невозможно подобрать мета-пакет" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -251,11 +251,11 @@ msgstr "" msgid "Reading cache" msgstr "Чтение кэша" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -263,11 +263,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Не найдено действующее зеркало" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -287,11 +287,11 @@ msgstr "" "Ответ 'Нет' отменит обновление." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Сгенерировать источники по умолчанию?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -304,11 +304,11 @@ msgstr "" "\n" "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Информация о репозитории неверна" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -316,11 +316,11 @@ msgstr "" "В результате обновления информации о репозиториях образовался неверный файл. " "Пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Источники третьих сторон отключены" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -331,11 +331,11 @@ msgstr "" "обновления вы можете снова включить их с помощью утилиты 'software-" "properties' или synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Ошибка при обновлении" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в " "сети, проверьте сетевые подключения и повторите попытку." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Недостаточно свободного места на диске" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +359,15 @@ msgstr "" "предыдущих установок с помощью команды 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Вы хотите начать обновление системы?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Невозможно установить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,11 +379,11 @@ msgstr "" "Обновление прервано. Система, возможно, находится в неработоспособном " "состоянии. Запущено восстановление системы (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Невозможно загрузить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -391,17 +391,17 @@ msgstr "" "Обновление прервано. Проверьте соединение с Интернет или установочный диск и " "попробуйте снова. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Эти установленные пакеты больше не поддерживаются официально. Теперь их " @@ -410,23 +410,23 @@ msgstr "" "Если у вас не подключен репозиторий 'universe', на следующем шаге вам " "предложат удалить эти пакеты. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Удалить устаревшие пакеты?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Пропустить этот шаг" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Удалить" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Ошибка при фиксировании" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,31 +435,31 @@ msgstr "" "ниже. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Восстановление первоначального состояния системы" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Проверка менеджера пакетов" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Обновление информации о репозитории" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Неверная информация о пакете" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -472,19 +472,19 @@ msgstr "" "найден.\n" "Это говорит о серьезной проблеме, пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Запрос подтверждения" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Обновление" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Поиск устаревших программ" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Обновление системы завершено." @@ -619,7 +619,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Ваша система не требует обновления" @@ -857,15 +857,15 @@ msgstr "" "Проверка подлинности обновления не удалась. Возможно, возникла проблема в " "сети или на сервере. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Загрузка файла %li из %li со скоростью %s/с" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Загрузка файла %li из %li с неизвестной скоростью" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Загрузка файла %li из %li со скоростью %s/с" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -909,8 +909,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Установить обновления" +msgid "Distribution updates" +msgstr "_Продолжить обновление" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -924,47 +924,26 @@ msgid "Version %s: \n" msgstr "Версия %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Загрузка списка изменений..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "Проверить" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Размер загружаемых данных: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -972,40 +951,40 @@ msgstr[0] "Вы можете установить %s обновление" msgstr[1] "Вы можете установить %s обновления" msgstr[2] "Вы можете установить %s обновлений" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Пожалуйста подождите, это может занять некоторое время." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Обновление завершено" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Установить обновления" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Новая версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Ваша версия Ubuntu больше не поддерживается" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -1015,17 +994,17 @@ msgstr "" "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для " "получения информации об обновлении посетите http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Доступен новый релиз дистрибутива '%s'</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Индекс программ поврежден" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1035,12 +1014,35 @@ msgstr "" "используйте менеджер пакетов \"Synaptic\" или запустите в терминале \"sudo " "apt-get install -f\"." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Вы должны проверить обновления вручную</big></b>\n" "\n" @@ -1065,34 +1067,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Начать обновление?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Отменить _загрузку" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Изменения" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Проверить" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Проверить каналы приложений на наличие обновлений" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Описание" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Сведения о релизе" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1100,15 +1098,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Показывать прогресс для отдельных файлов" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Обновления программ" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1116,37 +1114,37 @@ msgstr "" "Обновления программ исправляют ошибки, уязвимости и добавляют новые " "возможности." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "Обновить" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Обновить систему до последней версии Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "Проверить" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Продолжить обновление" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "Не показывать эту информацию в дальнейшем" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "Установить обновления" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Изменения" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1180,27 +1178,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Добавить _Cdrom" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Авторизация" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "Удалить загруженные файлы программ:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Загрузка завершена" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Импортировать открытый ключ доверенного поставщика программ" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Обновления в Интернет" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1208,50 +1211,50 @@ msgstr "" "Автоматически будут установлены только обновления безопасности с официальных " "серверов Ubuntu" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "Восстановить начальные" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Восстановить исходные ключи вашего дистрибутива" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Параметры приложений" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "Автоматически проверять наличие обновлений:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "Загружать обновления в фоне, но не устанавливать их" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "Импортировать файл ключа" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "Устанавливать обновления безопасности без запроса" @@ -1640,6 +1643,16 @@ msgstr "DFSG-совместимое ПО с зависимостями от не msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-совместимое ПО" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Загрузка файла %li из %li с неизвестной скоростью" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Установить обновления" + +#~ msgid "Cancel _Download" +#~ msgstr "Отменить _загрузку" + #~ msgid "Some software no longer officially supported" #~ msgstr "Некоторые программы больше не поддерживаются официально" @@ -1730,9 +1743,6 @@ msgstr "Не-DFSG-совместимое ПО" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Ключи</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Добавить _Cdrom" - #~ msgid "Installation Media" #~ msgstr "Установочный носитель" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -96,50 +96,50 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Ibihuzagihe bya porogaramumudasobwa" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 #, fuzzy msgid "Error importing selected file" msgstr "Kuzaza Byahiswemo IDOSIYE" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 #, 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 #, fuzzy msgid "Error removing the key" msgstr "i Urufunguzo" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 #, 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -147,11 +147,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -165,20 +165,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -188,23 +188,23 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -212,11 +212,11 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +243,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -272,11 +272,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -285,43 +285,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "i Urufunguzo" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -330,15 +330,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -347,78 +347,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "Muyobozi ni" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -428,20 +428,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -560,7 +560,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "Sisitemu ni Hejuru Kuri Itariki" @@ -790,14 +790,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -840,8 +840,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Kwinjiza porogaramu" +msgid "Distribution updates" +msgstr "Byarangiye" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -856,115 +856,115 @@ msgstr "Verisiyo \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Iyimura... i" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Kwinjiza porogaramu" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Verisiyo \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ikwirakwiza... ni Oya" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -980,34 +980,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Amahinduka" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Isobanuramiterere" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1015,53 +1011,53 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Ibihuzagihe bya porogaramumudasobwa" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "U_pgrade" msgstr "Byarangiye" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "Byarangiye" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "Kwinjiza porogaramu" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Amahinduka" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1096,77 +1092,81 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Download from:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "i Byahiswemo Urufunguzo Bivuye i" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<B B" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Mburabuzi Utubuto" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Ibihuzagihe bya porogaramumudasobwa" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1550,6 +1550,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Kwinjiza porogaramu" + +#, fuzzy #~ msgid "Your system has already been upgraded." #~ msgstr "Sisitemu" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n" "Language-Team: Slovak <sk-i18n@linux.sk>\n" @@ -88,48 +88,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Aktualizácie softvéru" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Zdrojový" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Zdrojový" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importovať kľúč" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Chyba pri importovaní vybraného súboru" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Chyba pri odstraňovaní kľúča" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -140,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Prosím, zadajte názov disku" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Prosím, vložte disk do mechaniky:" @@ -160,20 +160,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:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Nemôžem aktualizovať požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Nemôžem vypočítať aktualizáciu" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -185,11 +185,11 @@ msgstr "" "ako chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíkov" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -199,23 +199,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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Nemôžem inštalovať '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 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:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Nemôžem odhadnúť meta balík." -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -248,11 +248,11 @@ msgstr "" msgid "Reading cache" msgstr "Čítam vyrovnávaciu pamäť cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Nebol nájdený vhodný server" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -284,11 +284,11 @@ msgstr "" "Pokiaľ zvolíte 'Nie', súbor nebude zmenený." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -302,11 +302,11 @@ msgstr "" "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor " "nebude zmenený." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Neplatná informácia o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -314,11 +314,11 @@ msgstr "" "Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. " "Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Zdroje tretích strán sú zakázané" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -329,11 +329,11 @@ msgstr "" "Môžete ich povoliť po upgrade pomocou nástroja 'vlastnosti-softwaru' alebo " "pomocou synapticu." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Chyba počas aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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 "" "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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Nedostatok voľného miesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +357,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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Chcete začať s aktualizáciou?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Nebolo možné nainštalovať aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +377,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:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Nebolo možné stiahnuť požadované balíky" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,17 +389,17 @@ 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:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Tieto nainštalované balíky už viac nie sú oficiálne podporované, ale stará " @@ -408,23 +408,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:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Odstrániť zastarané balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Preskočiť tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Odstrániť" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Chyba počas potvrdzovania" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -433,31 +433,31 @@ msgstr "" "uvedené správy. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Obnovuje sa pôvodný stav systému" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Kontrola správcu balíkov" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Aktualizácia informácií o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Neplatná informácia o balíku" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -470,19 +470,19 @@ msgstr "" "s'.\n" "To znamená závažný problém. Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Požaduje sa potvrdenie" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Prebieha aktualizácia" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Vyhľadávanie zastaraného softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Aktualizácia systému je dokončená." @@ -617,7 +617,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Váš systém je aktuálny" @@ -857,15 +857,15 @@ msgstr "" "Zlyhalo overenie autenticity aktualizácie. Môže to byť spôsobené sieťovým " "problémom alebo nedostupňosťou servera. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Sťahovanie súboru %li z %li pri %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Sťahovanie súboru %li z %li pri %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -907,8 +907,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Nainštalovať _aktualizácie" +msgid "Distribution updates" +msgstr "_Pokračovať v aktualizácii" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -922,47 +922,26 @@ msgid "Version %s: \n" msgstr "Verzia %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Získava sa zoznam zmien..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Skontrolovať" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Veľkosť na stiahnutie: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -970,40 +949,40 @@ 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Čakajte prosím, toto môže chvíľu trvať." -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Aktualizácia je dokončená" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Kontrolujem aktualizácie..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Nová verzia: %s (veľkosť: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Verzia %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Vaša distribúcia už nie je podporovaná" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +993,17 @@ msgstr "" "Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu." "com.\"" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Index softvéru je poškodený" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1034,12 +1013,35 @@ msgstr "" "Na odstránenie tohto problému použite správcu balíkov 'Synaptic' alebo " "spustite 'sudo apt-get install -f' v termáli." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Musíte kontrolovať aktualizácie·manuálne</big></b>\n" "\n" @@ -1065,34 +1067,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Spustiť aktualizáciu?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "_Zrušiť sťahovanie" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Zmeny" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Skontrolovať" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Skontrolovať, či zdroje softvéru neobsahujú nové aktualizácie" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Popis" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Poznámky k vydaniu" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1100,15 +1098,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Zobraziť priebeh jednotlivých súborov" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Aktualizácie softvéru" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1116,37 +1114,37 @@ msgstr "" "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " "zraniteľnosti alebo poskytujú nové vlastnosti." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Aktualizovať" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aktualizovať na najnovšiu verziu Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Skontrolovať" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_Pokračovať v aktualizácii" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Túto správu už viac nezobrazovať" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "Nainštalovať _aktualizácie" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Zmeny" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1180,27 +1178,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Pridať _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autentifikácia" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Zmazať stiahnuté inštalačné balíčky:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Sťahovanie je dokončené" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importovať verejný kľúč dôveryhodného poskytovateľa softvéru" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internetové aktualizácie" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1208,51 +1211,51 @@ msgstr "" "Automaticky budú inštalované iba bezpečnostné aktualizácie z oficiálnych " "Ubuntu serverov." -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "_Obnoviť predvolené" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Obnoviť pôvodné kľúče distribúcie" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "<b>Zdroje softvéru</b>" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Zdrojový" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_Kontrolovať aktualizácie:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Stiahnuť aktualizácie automaticky, no neinštalovať ich" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "Importovať _kľúč" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Bezpečnostné aktualizácie inštalovať automaticky bez potvrdenia" @@ -1647,6 +1650,16 @@ 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 "Downloading file %li of %li with unknown speed" +#~ msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Nainštalovať _aktualizácie" + +#~ msgid "Cancel _Download" +#~ msgstr "_Zrušiť sťahovanie" + #~ msgid "Some software no longer officially supported" #~ msgstr "Niektoré programy už nie sú viac oficiálne podporované" @@ -1734,9 +1747,6 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Kľúče</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Pridať _CD" - #~ msgid "Installation Media" #~ msgstr "Inštalačné média" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic <dejan@wavebone.net>\n" "Language-Team: Serbian <sr@li.org>\n" @@ -89,45 +89,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importiranje kljuca" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -135,11 +135,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -153,20 +153,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -175,34 +175,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +229,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,42 +271,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,77 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -412,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -548,7 +548,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -772,14 +772,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -816,7 +816,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -830,46 +830,24 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -877,68 +855,90 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -954,34 +954,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -989,49 +985,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1063,73 +1059,77 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -88,51 +88,51 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Programvaruuppdateringar" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 #, fuzzy msgid "Active" msgstr "Aktivera" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Källkod" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Källkod" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Importera nyckel" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Fel vid importing av vald fil" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Fel vid borttagning av nyckeln" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -143,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Skriv in ett namn på skivan" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Sätt in en skiva i enheten:" @@ -164,20 +164,20 @@ msgstr "" "programmet. Reparera dem först med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Kan inte uppdatera obligatoriska meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 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:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Kunde inte beräkna uppdateringen" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -189,11 +189,11 @@ msgstr "" "vänlig rapportera detta som en bugg. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisiera vissa paket" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -203,12 +203,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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Kan inte installera \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,11 +217,11 @@ msgstr "" "rapportera detta som en bugg. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Kan inte gissa meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -255,11 +255,11 @@ msgstr "" msgid "Reading cache" msgstr "Läser cache" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -267,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Hittade ingen giltig serverspegel" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -291,11 +291,11 @@ msgstr "" "Om du väljer \"nej\" kommer uppdateringen avbrytas." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "Lägg till standardförråd?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -308,11 +308,11 @@ msgstr "" "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" kommer " "uppdateringen avbrytas." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Information om förråd ogiltig" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -320,11 +320,11 @@ msgstr "" "Uppdatering av förrådsinformationen orsakade en ogiltig fil. Var vänlig " "rapportera detta som en bugg." -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Tredjepartskällor inaktiverade" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -335,11 +335,11 @@ msgstr "" "aktivera dem efter uppgraderingen med verktyget \"software-properties\" " "eller med synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Fel vid uppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -348,11 +348,11 @@ msgstr "" "av nätverksproblem, var god kontrollera din nätverksanslutning och försök " "igen." -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Inte tillräckligt med ledigt diskutrymme" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -364,15 +364,15 @@ msgstr "" "använda 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Vill du starta uppdateringen?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Det gick inte att installera uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -384,11 +384,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:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Det gick inte ladda ner uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -396,40 +396,40 @@ msgstr "" "Uppdateringen avbryts nu. Var god kontrollera din internetanslutning eller " "ditt installationsmedia och försök igen. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "Dessa installerade paket har inte längre officiellt stöd, och är nu enbart " "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:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "Ta bort föråldrade paket?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_Hoppa över det här steget" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Ta bort" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "Fel inträffade vid utförandet" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -438,31 +438,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "Återställer systemstatus" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Kontrollerar pakethanterare" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Uppdaterar förrådsinformation" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Ogiltig paketinformation" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -475,19 +475,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:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Ber om bekräftelse" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Uppgraderar" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Söker efter föråldrad mjukvara" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Systemuppdateringen är klar." @@ -618,7 +618,7 @@ msgstr "Stäng alla öppna program och dokument för att undvika dataförlust." #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "Ditt system är uppdaterat" @@ -864,15 +864,15 @@ msgstr "" "Autentisering av uppdateringen misslyckades. Det kan vara ett problem med " "nätverket eller servern. " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Hämtar hem fil %li av %li i %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Hämtar hem fil %li av %li med okänd hastighet" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "Hämtar hem fil %li av %li i %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -916,8 +916,8 @@ msgstr "%d uppdateringar" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "%d uppdateringar" +msgid "Distribution updates" +msgstr "Distribution:" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -931,90 +931,67 @@ msgid "Version %s: \n" msgstr "Version %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "Hämtar lista med ändringar..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 #, fuzzy msgid "_Uncheck All" msgstr "_Uppdatera alla" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "_Kontrollera" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -#, fuzzy -msgid "None" -msgstr "en" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -#, fuzzy -msgid "1 KB" -msgstr "%d kB" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, fuzzy, python-format -msgid "%.0f KB" -msgstr "%.2f MB" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, fuzzy, python-format -msgid "%.1f MB" -msgstr "%.2f MB" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "Nerladdningsstorlek: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, 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:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "Var god vänta, det här kan ta lite tid" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "Uppdateringen är färdig" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Kontrollera efter tillgängliga uppdateringar" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "Ny version: %s (Storlek: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s:" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, fuzzy, python-format msgid "(Size: %s)" msgstr "Storlek:" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "Din distribution stöds inte längre" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 +1001,17 @@ msgstr "" "till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer " "information om att uppgradera." -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "Indexet för program är trasigt" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -1044,12 +1021,37 @@ msgstr "" "packethanteraren \"Synaptic\" eller kör \"sudo apt-get install -f\" i en " "terminal för att rätta till det här problemet först." +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +#, fuzzy +msgid "None" +msgstr "en" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +#, fuzzy +msgid "1 KB" +msgstr "%d kB" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, fuzzy, python-format +msgid "%.0f KB" +msgstr "%.2f MB" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, fuzzy, python-format +msgid "%.1f MB" +msgstr "%.2f MB" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>Du måste titta efter uppdateringar manuellt</big></b>\n" "\n" @@ -1075,34 +1077,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Starta uppgraderingen?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Avbryt _nedladdningen" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Ändringar" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "_Kontrollera" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "Kontrollera programvarukanalerna efter nya uppdateringar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Beskrivning" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "Versionsinformation" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1110,15 +1108,15 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "Visa förlopp för enstaka filer" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Programvaruuppdateringar" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1126,37 +1124,37 @@ msgstr "" "Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig nya " "funktioner." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_Uppdateringar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "Uppdatera till senaste versionen av Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "_Kontrollera" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "Distribution:" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_Dölj denna information i framtiden" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_Installera uppdateringar" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Ändringar" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "updates" msgstr "Uppdateringar" @@ -1191,27 +1189,32 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "Lägg till _CD" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Autentisering" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_Ta bort nerladdade programfiler:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Hämtningslogg" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "Importera den publika nyckeln från en betrodd mjukvaruutgivare" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internetuppdateringar" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1219,52 +1222,52 @@ msgstr "" "Bara säkerhetsuppdateringar från de officiella Ubuntuservrarna kommer " "installeras automatiskt" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "_Återställ standardalternativ" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "Återställ standardnycklarna för din distribution" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "Programvarukällor" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Källkod" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 #, fuzzy msgid "Statistics" msgstr "Status" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 #, fuzzy msgid "Submit statistical information" msgstr "Hämta användningsinformation" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "Kolla efter uppdateringar _automatiskt:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_Hämta uppdateringar i bakgrunden, men installera dem inte" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_Installera säkerhetsuppdateringar utan bekräftelse" @@ -1658,6 +1661,16 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden" msgid "Non-DFSG-compatible Software" msgstr "Inte DFSG-kompatibel programvara" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Hämtar hem fil %li av %li med okänd hastighet" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "%d uppdateringar" + +#~ msgid "Cancel _Download" +#~ msgstr "Avbryt _nedladdningen" + #~ msgid "Some software no longer officially supported" #~ msgstr "Viss programvara har inte längre officiellt stöd" @@ -1753,9 +1766,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "<b>Keys</b>" #~ msgstr "<b>Nycklar</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "Lägg till _CD" - #~ msgid "Installation Media" #~ msgstr "Installationsmedia" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul <roysheng@msn.com>\n" "Language-Team: Thai <th@li.org>\n" @@ -87,46 +87,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "ซอฟต์แวร์ปรับปรุง" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "นำเข้ากุญแจ" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "ไม่สามารถนำเข้าไฟล์ที่เลือกไว้" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "ไฟล์ที่เลือกไว้อาจจะไม่ใช่ GPG กุญแจไฟล์หรืออาจจะเสียหาย" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "มีปัญหาขณะลบกุจแจ" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -137,11 +137,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิสก์" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:" @@ -157,20 +157,20 @@ msgstr "" "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic " "หรือ apt-get ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "แพจเกจที่สำคัญจะถูกลบออก" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "ไม่สามารถคำนวนการปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -180,11 +180,11 @@ msgid "" msgstr "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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,23 +193,23 @@ msgstr "" "ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย " "คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "ไม่สามารถติดตั้ง '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -242,11 +242,11 @@ msgstr "" msgid "Reading cache" msgstr "กำลังอ่านจากที่เก็บชั่วคราว" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -277,11 +277,11 @@ msgstr "" "ถ้าคุณเลือก 'no' การปรับปรุงจะถูกยกเลิก" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "สร้าง default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -293,21 +293,21 @@ msgstr "" "\n" "ควรเพิ่มรายการสำหรับ '%s' หรือไม่?ถ้าคุณเลือก 'No' การปรับปรุงจะถูกยกเลิก" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "แหล่งอื่นๆใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -318,11 +318,11 @@ msgstr "" "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' " "หรือด้วยโปรแกรม synaptic" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "เกิดข้อผิดพลาดขณะปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -330,11 +330,11 @@ msgstr "" "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติแล้วจะเป็นปัญหาด้านเครือข่าย " "กรุณาตรวจสอบการสื่อสารในเครือข่ายของคุณแล้วลองใหม่อีกที" -#: ../DistUpgrade/DistUpgradeControler.py:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -345,15 +345,15 @@ msgstr "" "เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "ไม่สามารถปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -365,11 +365,11 @@ msgstr "" "การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --" "configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -377,17 +377,17 @@ msgstr "" "การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation " "mediaและลองอีกครั้ง " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "แพกเกจเหล่านีไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้วและตอนนี้ได้รับสนับสนุนจากชุมชน " @@ -395,55 +395,55 @@ msgstr "" "\\n\n" "ถ้าคุณไม่ได้เลือกใช้แหล่งข้อมูล 'universe' แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "_ข้ามขั้นตอนนี้" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "เ_อาออก" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 #, fuzzy msgid "Restoring original system state" msgstr "เริ่มระบบใหม่อีกครั้ง" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -455,19 +455,19 @@ msgstr "" "หลังจากการปรับปรุงข้อมูลของแพจเกจ แพจเกจที่จำเป็น '%s'ได้หายไป\n" "นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "_ถามการยืนยันจากคุณก่อน" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "กำลังปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "ปรับปรุงระบบเสร็จแล้ว" @@ -593,7 +593,7 @@ msgstr "เพื่อป้องกันข้อมูลสูญหาย #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "ระบบของคุณทันสมัยแล้ว" @@ -822,15 +822,15 @@ msgid "" "or with the server. " msgstr "ยืนยันการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ด้วย %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ด้วย %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -871,8 +871,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "_ติดตั้งปรัยปรุง" +msgid "Distribution updates" +msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -886,86 +886,65 @@ msgid "Version %s: \n" msgstr "รุ่น %s: \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "เ_ลือก" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "ขนาดดาวน์โหลด: %s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "ปรับปรุงเสร็จสิ้นแล้ว" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "รุ่นใหม่: %s (ขนาด: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "รุ่น %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -975,17 +954,17 @@ msgstr "" "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com " "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "ดัชนีของซอฟแวร์เสียหาย" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -994,12 +973,35 @@ msgstr "" "ไม่สามารถที่จะติดตั้งหรือลบออกซอฟแวร์ใดๆ กรุณาใช้โปรแกรมจัดการแพกเกจ \"Synaptic\" หรือ " "คำสั่ง \"sudo apt-get install -f\" ในเทอร์มินัลเพื่อที่จะแก้ปัญหานี้ก่อน" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>คุณต้องตรวจหารายการปรับปรุงด้วยตนเอง</big></b>\n" "\n" @@ -1024,34 +1026,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>เริ่มการปรับปรุงหรือไม่?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "ยกเลิก_ดาวน์โหลด" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "เปลี่ยนแปลง" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "ต_รวจ" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "ตรวจช่องซอฟแวร์สำหรับรายการปรับปรุงใหม่" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "คำบรรยาย" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "บันทึกรายการปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1059,51 +1057,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "แสดงการคืบหน้าของแต่ละไฟล์" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "ซอฟต์แวร์ปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "_ปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "เ_ลือก" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "_ซ่อนข้อมูลนี้ในคราวหน้า" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "เปลี่ยนแปลง" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1137,76 +1135,81 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "เพิ่ม_ซีดีรอม" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "การยืนยันของจริง" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "_ลบซอฟแวร์ไฟล์ที่ดาวน์โหลด:" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "ดาวน์โหลดเสร็จแล้ว" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "นำเข้ากุญแจสาธารณะจากผู้ให้ซอฟแวร์ที่น่าเชื่อถือ" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "ปรัปรุงทางอินเทอร์เน็ต" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "การปรับปรุงด้านความปลอดภัยจะติดตั้งโดยอัตโนมัติจากเซิรฟ์เวอร์ทางการของอูบันตูเท่านั้น" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "_คืนค่าปริยาย" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "คืนกุญแจเดืมของชุดเผยแพร่ของคุณ" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "คุณสมบัติของซอฟแวร์" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "_ตรวจหารายการปรับปรุงโดยอัตโนมัติ:" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "_ดาวน์โหลดปรับปรุงอยู่เบื้องหลังแต่ยังไม่ต้องติดตั้ง" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "_นำเข้ากุญแจไฟล์" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "_ติดตั้งการปรับปรุงด้านความปลอดภัยโดยไม่ต้องถามก่อน" @@ -1591,6 +1594,16 @@ msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอ msgid "Non-DFSG-compatible Software" msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "_ติดตั้งปรัยปรุง" + +#~ msgid "Cancel _Download" +#~ msgstr "ยกเลิก_ดาวน์โหลด" + #~ msgid "Some software no longer officially supported" #~ msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" @@ -1674,9 +1687,6 @@ msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" #~ msgid "<b>Keys</b>" #~ msgstr "<b>กุญแจ</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "เพิ่ม_ซีดีรอม" - #~ msgid "Installation Media" #~ msgstr "การติดตั้งมีเดีย" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI <okircali@gmail.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -88,46 +88,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Kanal Düzenle" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Anahtar aktar" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Seçili dosyayı aktarmada hata" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Anahtar kaldırmada hata" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -138,11 +138,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Lütfen disk için bir isim girin" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Lütfen sürücüye bir disk yerleştirin:" @@ -158,20 +158,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:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -180,34 +180,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "'%s' yüklenemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 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:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -239,11 +239,11 @@ msgstr "" msgid "Reading cache" msgstr "Önbellek okunuyor" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "Geçerli yansı bulunamadı" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -285,32 +285,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:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "Üçüncü parti kaynaklar devredışı bırakıldı" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "Güncelleştirme sırasında hata" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -318,11 +318,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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Yeterince boş disk alanı yok" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -331,15 +331,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Yükseltmeyi başlatmak istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Yükseltmeler kurulamadı" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -348,11 +348,11 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Yükseltmeler indirilemedi" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -360,67 +360,67 @@ 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:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "Bu Adımı _Atla" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "_Kaldır" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "Geçersiz paket bilgisi" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -430,19 +430,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "Yükseltiliyor" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Sistem yükseltmesi tamamlandı." @@ -561,7 +561,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -788,14 +788,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -833,7 +833,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -847,113 +847,113 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -974,34 +974,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Yükseltme başlatılsın mı?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1009,49 +1005,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1083,76 +1079,80 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 +msgid "D_elete downloaded software files:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "İndirme tamamlandı" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Yazılım Özellikleri" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "Anahtar aktar" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\n" "Language-Team: Ukrainian <uk@li.org>\n" @@ -88,48 +88,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Оновлення програм" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Текст програми" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Текст програми" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "Імпортувати ключ" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Помилка імпорту вибраного файлу" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Помилка видалення ключа" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -137,11 +137,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "Введіть назву диску" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "Вставте диск в пристрій:" @@ -157,20 +157,20 @@ msgstr "" "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені " "цією програмою. Скористайтесь перш програмами synaptic чи apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "Не можливо поновити необхідні meta-пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "Це призведе довидалення базового пакунку системи" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "Не можливо розрахувати поновлення" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -180,23 +180,23 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "Помилка підписів в деяких пакунках" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -204,11 +204,11 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -238,11 +238,11 @@ msgstr "" msgid "Reading cache" msgstr "Зчитування кешу" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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,12 +250,12 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 #, fuzzy msgid "No valid mirror found" msgstr "Не знайдено" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -281,43 +281,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "Помилка в даних про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "Помилка підчас поновлення" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "Недостатньо місця на диску" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -326,15 +326,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "Бажаєте почати апгрейд системи?" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "Неможливо провести апргрейд системи" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -347,11 +347,11 @@ msgstr "" "Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою " "Synaptic для налаштування системи." -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "Неможливо завантажити пакунки для апргрейду системи" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -359,37 +359,37 @@ msgstr "" "Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з " "інтернетом чи носії та спробуйте знов. " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 #, fuzzy msgid "Remove obsolete packages?" msgstr "Видалити непотрібні пакунки?" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -398,32 +398,32 @@ msgstr "" "нижче. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 #, fuzzy msgid "Restoring original system state" msgstr "Перезавантаження системи" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "Перевірка програми управління пакунками" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "Отримання інформації про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -433,20 +433,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "Запит підтвердження" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "Пошук програм, що не використовуються" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "Апргрейд системи завершено." @@ -578,7 +578,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "Ваша система оновлена!" @@ -816,15 +816,15 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, fuzzy, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Завантажується файл %li of %li at %s/s" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, fuzzy, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "Завантажується файл %li of %li на невизначенії швидкості" +msgid "Downloading file %(current)li of %(total)li" +msgstr "Завантажується файл %li of %li at %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -866,8 +866,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "Встановлення оновлень..." +msgid "Distribution updates" +msgstr "П_родовжити апгрейд системи" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -882,46 +882,24 @@ msgstr "Версія %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Завантаження змін" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -929,71 +907,93 @@ msgstr[0] "Неможливо провести апргрейд системи" msgstr[1] "Неможливо провести апргрейд системи" msgstr[2] "Неможливо провести апргрейд системи" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 #, fuzzy msgid "Update is complete" msgstr "Завантадення пакунків завершено" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Встановлення оновлень..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Версія %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ваш дистрибутив вже не підтримується" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -1010,34 +1010,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>Почати апгрейд системи?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "Скасувати _Завантаження" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Зміни" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Опис" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1045,52 +1041,52 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Оновлення програм" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "П_родовжити апгрейд системи" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "Встановлення оновлень..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Зміни" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1125,82 +1121,86 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +msgid "Add Cdrom" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Аутентифікація" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "Завантадення пакунків завершено" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Видалити виділений ключ з в'язки довірених ключів." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>Оновлення через Інтернет</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Відновити початкові параметри" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Відновити початкові ключі" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Властивості програм" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Текст програми" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "Перевіряти оновлення кожні" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "Імпортувати ключ" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1587,6 +1587,17 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "Завантажується файл %li of %li на невизначенії швидкості" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Встановлення оновлень..." + +#~ msgid "Cancel _Download" +#~ msgstr "Скасувати _Завантаження" + #~ msgid "Could not find any upgrades" #~ msgstr "Не знайдено пакунків для апгрейду" diff --git a/po/update-manager.pot b/po/update-manager.pot index 56bd51a9..2909b623 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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -88,45 +88,45 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -134,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -152,20 +152,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -174,34 +174,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +228,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,77 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -411,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -544,7 +544,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -768,14 +768,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -812,7 +812,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -826,114 +826,114 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -949,34 +949,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -984,49 +980,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1058,73 +1054,77 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n" "Language-Team: Urdu <urd@li.org>\n" @@ -88,46 +88,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 #, fuzzy msgid "Import key" msgstr "امپورٹ کی" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -135,11 +135,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -153,20 +153,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -175,34 +175,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +229,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,42 +271,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,77 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -412,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -545,7 +545,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -769,14 +769,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -813,7 +813,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -827,114 +827,114 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -950,34 +950,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -985,49 +981,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1059,74 +1055,78 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "امپورٹ کی" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n" "Language-Team: Urdu <urd@li.org>\n" @@ -88,46 +88,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 #, fuzzy msgid "Import key" msgstr "امپورٹ کی" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -135,11 +135,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -153,20 +153,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -175,34 +175,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +229,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,42 +271,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,77 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -412,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -545,7 +545,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -769,14 +769,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -813,7 +813,7 @@ msgid "Backports" msgstr "" #: ../UpdateManager/UpdateManager.py:240 -msgid "Normal updates" +msgid "Distribution updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin @@ -827,114 +827,114 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -950,34 +950,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -985,49 +981,49 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1059,74 +1055,78 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 -msgid "Internet Updates" +msgid "Import the public key from a trusted software provider" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:14 +msgid "Internet Updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 msgid "Software Sources" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Import Key File" msgstr "امپورٹ کی" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung <tttrung@hotmail.com>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" @@ -87,48 +87,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Bản cập nhật phần mềm" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "Nguồn" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "Nguồn" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "Gặp lỗi khi nhập tâp tin đã chọn" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 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:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 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:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -136,11 +136,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -154,20 +154,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -177,23 +177,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:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -201,11 +201,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:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +232,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -274,43 +274,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -319,15 +319,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -336,78 +336,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "Một bộ quản lý gói khác đang chạy" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -417,20 +417,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "Nâng cấp xong" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -549,7 +549,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "Hệ thống bạn toàn mới nhất." @@ -779,14 +779,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -830,7 +830,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "Đang cài đặt bản cập nhật..." #. TRANSLATORS: updates from an 'unknown' origin @@ -846,115 +846,115 @@ msgstr "Phiên bản %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "Đang tải các thay đổi" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "Phiên bản %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, 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:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -970,34 +970,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Đổi" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "Mô tả" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1005,51 +1001,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "Bản cập nhật phần mềm" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "Đổi" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1084,80 +1080,84 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +msgid "Add Cdrom" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "Xác thực" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Download from:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Gỡ bỏ khóa được chọn ra vòng khóa tin cây." -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>Cập nhật dùng Mạng</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "Phục hồi mặc định" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Phục hồi các khóa mặc định" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Thuộc tính phần mềm" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "Nguồn" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "Kiểm tra có cập nhật sau mỗi" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1544,6 +1544,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Đang cài đặt bản cập nhật..." + +#, fuzzy #~ msgid "Important security updates of Ubuntu" #~ msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" @@ -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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd <translations@canonical.com>\n" "Language-Team: Xhosa <xh-translate@ubuntu.com>\n" @@ -88,46 +88,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "Bonisa izihlaziyo" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -135,11 +135,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -153,20 +153,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -175,34 +175,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +229,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,42 +271,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, 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:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,77 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -412,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -545,7 +545,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "" @@ -769,14 +769,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -817,7 +817,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "Bonisa izihlaziyo" #. TRANSLATORS: updates from an 'unknown' origin @@ -832,115 +832,115 @@ msgid "Version %s: \n" msgstr "" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -956,34 +956,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -991,51 +987,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 #, fuzzy msgid "Software Updates" msgstr "Bonisa izihlaziyo" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "Bonisa izihlaziyo" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1068,75 +1064,79 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 -msgid "Authentication" +msgid "Add Cdrom" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:10 -msgid "D_elete downloaded software files:" +msgid "Authentication" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:11 -msgid "Download from:" +msgid "D_elete downloaded software files:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:12 -msgid "Import the public key from a trusted software provider" +msgid "Download from:" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:13 +msgid "Import the public key from a trusted software provider" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "Bonisa izihlaziyo" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1487,6 +1487,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "Bonisa izihlaziyo" + +#, fuzzy #~ msgid "Important security updates of Ubuntu" #~ msgstr "Bonisa izihlaziyo" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3ad9723b..a9a8830d 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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow <catinsnow@gmail.com>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -87,52 +87,52 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "软件更新" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "" "二进制\n" "源代码" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "" "二进制\n" "源代码" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "导入密钥" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "在导入所选文件时出错" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "所选文件可能不是GPG密钥文件或者已经损坏." -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "删除密钥时候出错" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你所选择的密钥不能被删除。请汇报这个bug" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -143,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "请输入光盘的名称" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "请将光盘插入到光驱里:" @@ -163,20 +163,20 @@ msgstr "" "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者" "apt-get修复它们。" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "不能升级要求的元包" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "一个必要的软件包会被删除" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "无法计算升级" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -186,11 +186,11 @@ msgid "" msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "在认证一些软件包时出错" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 " @@ -199,23 +199,23 @@ msgstr "" "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软" "件包的列表。" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "无法安装'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "无法安装要求的软件包。请汇报这个bug。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "无法猜出元包" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -247,11 +247,11 @@ msgstr "" msgid "Reading cache" msgstr "正在读取缓存" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "未找到可用的镜像" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -280,11 +280,11 @@ msgstr "" "如果选'no'更新将被取消." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "生成默认的源?" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -296,21 +296,21 @@ msgstr "" "\n" "添加用于'%s'的缺省条目?如果选择'No',升级将被取消." -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "源的信息无效" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "第三方源被禁用" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -320,21 +320,21 @@ msgstr "" "源列表中一些第三方源被禁用.你可以在升级后用\"软件属性\"工具或新立得包管理器来" "重新启用它们." -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "升级时出错" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "磁盘空间不足" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -345,15 +345,15 @@ msgstr "" "get clean'命令来删除之前安装的临时软件包。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "你要开始升级么？" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "无法安装升级" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -365,81 +365,81 @@ msgstr "" "升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -" "a)。" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "无法下载升级包" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" "这些安装的包已不在被官方支持,仅为社区维护('universe').\n" "\n" "如果你没有启用'社区维护'源,下一步这些包将被建议移除. " -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "删除陈旧的软件包？" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "跳过这个步骤(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "删除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "确认时出错" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理时发生问题。更多信息请查看以下消息。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "正在恢复原始系统状态" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "正在检查软件包管理器" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "更新源的信息" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "无效的包信息" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -451,19 +451,19 @@ msgstr "" "包信息被更新后核心包'%s'没有找到.\n" "这标志着一个严重的错误,请报告bug." -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "请求确认" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "正在更新" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "寻找陈旧的软件包" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "系统更新完毕" @@ -589,7 +589,7 @@ msgstr "关闭所有打开的程序和文档以防止数据丢失。" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "您的系统已为最新" @@ -817,15 +817,15 @@ msgid "" "or with the server. " msgstr "认证升级信息失败。可能是网络或服务器的问题。 " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "正在下载文件 %li/%li 速度是 %s/s" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "正在下载文件 %li/%li 速度未知" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "正在下载文件 %li/%li 速度是 %s/s" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -865,8 +865,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "安装更新" +msgid "Distribution updates" +msgstr "继续升级(_R)" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -880,86 +880,65 @@ msgid "Version %s: \n" msgstr "版本 %s： \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "正在下载更新列表..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "检查（_C）" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "下载文件大小：%s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "你可以安装 %s 个更新" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "请稍等，这需要花一些时间。" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "检查有效的更新" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "新版本：%s(大小：%s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "您的发行版不再被支持" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -969,17 +948,17 @@ msgstr "" "\r\n" "http://www.ubuntu.com 来获取更多有关升级的信息。" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>新发行版 '%s' 可用</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "软件索引已被破坏" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -988,12 +967,35 @@ msgstr "" "无法安装或删除任何软件。请使用包管理软件\"synaptic\"或在终端运行\"sudo apt-" "get install -f\"来修正这个问题。" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>你必须手动检测升级</big></b>\n" "\n" @@ -1018,34 +1020,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>开始升级？</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "取消下载(_D)" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "变更" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "检查（_K）" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "检查软件频道以获得新的更新" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "描述" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "发布说明" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1053,51 +1051,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "显示单个文件进度" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "软件更新" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "软件更行可以为你修复错误，消除安全漏洞及提供新的特性" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "升级(_p)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "升级到最新版本的Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "检查（_C）" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "继续升级(_R)" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "在以后隐藏该信息(_H)" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "安装更新(_I)" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "变更" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1131,79 +1129,84 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "添加 CDrom(_C)" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "身份验证" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "删除下载的软件文件(_e)" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "下载完成" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "从信任的密钥环中删除选中的密钥。" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "Internet 更新" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "只有来自官方Ubuntu服务器的安全更新才会被自动安装。" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "恢复默认值(_D)" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "还原为发行版本预设的密钥" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "软件属性" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "" "二进制\n" "源代码" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "自动检查更新(_C)" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "在后台下载更新，但是不安装(_D)" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "导入密钥(_I)" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "不确认就安装安全更新(_I)" @@ -1593,6 +1596,16 @@ msgstr "带有非自由依赖关系的DFSG兼容软件" msgid "Non-DFSG-compatible Software" msgstr "非DFSG兼容软件" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "正在下载文件 %li/%li 速度未知" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "安装更新" + +#~ msgid "Cancel _Download" +#~ msgstr "取消下载(_D)" + #~ msgid "Some software no longer officially supported" #~ msgstr "一些软件已经不在被官方支持." @@ -1674,9 +1687,6 @@ msgstr "非DFSG兼容软件" #~ msgid "<b>Keys</b>" #~ msgstr "<b>密钥</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "添加 CDrom(_C)" - #~ msgid "Installation Media" #~ msgstr "安装媒体" diff --git a/po/zh_HK.po b/po/zh_HK.po index 06195b80..29847de7 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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -87,48 +87,48 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "軟件更新" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 #, fuzzy msgid "(Source Code)" msgstr "源程式碼" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 #, fuzzy msgid "Source Code" msgstr "源程式碼" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -136,11 +136,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "" @@ -154,20 +154,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -177,23 +177,23 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -201,11 +201,11 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 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,11 +232,11 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, 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:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -274,43 +274,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 #, fuzzy msgid "Error during update" msgstr "移除密碼匙時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -319,15 +319,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -336,78 +336,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -417,20 +417,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "" @@ -552,7 +552,7 @@ msgstr "" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 #, fuzzy msgid "Your system is up-to-date" msgstr "系統已經在最新狀態！" @@ -782,14 +782,14 @@ msgid "" "or with the server. " msgstr "" -#: ../UpdateManager/GtkProgress.py:107 +#: ../UpdateManager/GtkProgress.py:108 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:111 +#: ../UpdateManager/GtkProgress.py:113 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %(current)li of %(total)li" msgstr "" #: ../UpdateManager/UpdateManager.py:204 @@ -831,7 +831,7 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" +msgid "Distribution updates" msgstr "正在安裝軟件更新..." #. TRANSLATORS: updates from an 'unknown' origin @@ -847,116 +847,116 @@ msgstr "版本 %s: \n" #: ../UpdateManager/UpdateManager.py:521 #, fuzzy -msgid "Downloading the list of changes..." +msgid "Downloading list of changes..." msgstr "正在下載更改紀錄" -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 msgid "_Check All" msgstr "" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "正在安裝軟件更新..." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "已經不再支援你用的發行版本" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" #: ../data/glade/UpdateManager.glade.h:4 @@ -972,34 +972,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "更改紀錄" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "詳細說明" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1007,51 +1003,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "軟件更新" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Distribution Upgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟件更新..." -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "更改紀錄" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1086,80 +1082,84 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +msgid "Add Cdrom" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "認證" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Download from:" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "由你信任的密碼匙圈中移除指定的密碼匙。" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "Internet Updates" msgstr "<b>線上更新</b>" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore _Defaults" msgstr "還原為預設值" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "還原為預設密碼匙" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "軟件屬性" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 #, fuzzy msgid "Source code" msgstr "源程式碼" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy msgid "_Check for updates automatically:" msgstr "檢查軟件更新間隔：" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "" @@ -1545,6 +1545,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Normal updates" +#~ msgstr "正在安裝軟件更新..." + +#, fuzzy #~ msgid "Important security updates of Ubuntu" #~ msgstr "Ubuntu 5.10 安全性更新" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5bdfffd2..2c0cd116 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-09-23 00:48+0200\n" +"POT-Creation-Date: 2006-09-29 17:00+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan <pcman.tw@gmail.com>\n" "Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n" @@ -86,46 +86,46 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:601 -#: ../SoftwareProperties/SoftwareProperties.py:618 +#: ../SoftwareProperties/SoftwareProperties.py:604 +#: ../SoftwareProperties/SoftwareProperties.py:621 #, fuzzy msgid "Software Channel" msgstr "軟體更新" -#: ../SoftwareProperties/SoftwareProperties.py:609 -#: ../SoftwareProperties/SoftwareProperties.py:626 +#: ../SoftwareProperties/SoftwareProperties.py:612 +#: ../SoftwareProperties/SoftwareProperties.py:629 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:711 +#: ../SoftwareProperties/SoftwareProperties.py:714 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:717 +#: ../SoftwareProperties/SoftwareProperties.py:720 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:966 +#: ../SoftwareProperties/SoftwareProperties.py:969 msgid "Import key" msgstr "匯入金鑰" -#: ../SoftwareProperties/SoftwareProperties.py:976 +#: ../SoftwareProperties/SoftwareProperties.py:979 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:977 +#: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:989 +#: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:990 +#: ../SoftwareProperties/SoftwareProperties.py:993 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:1036 +#: ../SoftwareProperties/SoftwareProperties.py:1039 #, fuzzy, python-format msgid "" "<big><b>Error scanning the CD</b></big>\n" @@ -136,11 +136,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1093 +#: ../SoftwareProperties/SoftwareProperties.py:1096 msgid "Please enter a name for the disc" msgstr "請輸入光碟的名稱" -#: ../SoftwareProperties/SoftwareProperties.py:1109 +#: ../SoftwareProperties/SoftwareProperties.py:1112 msgid "Please insert a disc in the drive:" msgstr "請將光碟放入光碟機：" @@ -156,20 +156,20 @@ msgstr "" "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 " "synaptic 或 apt-get 來修恢它們。" -#: ../DistUpgrade/DistUpgradeCache.py:150 +#: ../DistUpgrade/DistUpgradeCache.py:183 msgid "Can't upgrade required meta-packages" msgstr "無法升級須要的元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:193 msgid "A essential package would have to be removed" msgstr "將會移除的核心套件" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:160 +#: ../DistUpgrade/DistUpgradeCache.py:196 msgid "Could not calculate the upgrade" msgstr "無法計算升級" -#: ../DistUpgrade/DistUpgradeCache.py:161 +#: ../DistUpgrade/DistUpgradeCache.py:197 #, fuzzy msgid "" "A unresolvable problem occurred while calculating the upgrade.\n" @@ -179,11 +179,11 @@ msgid "" msgstr "計算升級時發生無法解決的問題，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:186 +#: ../DistUpgrade/DistUpgradeCache.py:222 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" -#: ../DistUpgrade/DistUpgradeCache.py:187 +#: ../DistUpgrade/DistUpgradeCache.py:223 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 "" "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證" "的套件。" -#: ../DistUpgrade/DistUpgradeCache.py:252 +#: ../DistUpgrade/DistUpgradeCache.py:288 #, python-format msgid "Can't install '%s'" msgstr "無法安裝‘%s’" -#: ../DistUpgrade/DistUpgradeCache.py:253 +#: ../DistUpgrade/DistUpgradeCache.py:289 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "無法安裝須要的套件，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:260 +#: ../DistUpgrade/DistUpgradeCache.py:296 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:261 +#: ../DistUpgrade/DistUpgradeCache.py:297 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -240,11 +240,11 @@ msgstr "" msgid "Reading cache" msgstr "正在讀取快取" -#: ../DistUpgrade/DistUpgradeControler.py:147 +#: ../DistUpgrade/DistUpgradeControler.py:151 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:148 +#: ../DistUpgrade/DistUpgradeControler.py:152 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:239 +#: ../DistUpgrade/DistUpgradeControler.py:244 msgid "No valid mirror found" msgstr "找不到有效的 mirror" -#: ../DistUpgrade/DistUpgradeControler.py:240 +#: ../DistUpgrade/DistUpgradeControler.py:245 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -275,11 +275,11 @@ msgstr "" "如果選擇「否」，則更新會被取消。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:257 +#: ../DistUpgrade/DistUpgradeControler.py:262 msgid "Generate default sources?" msgstr "產生預設的來源？" -#: ../DistUpgrade/DistUpgradeControler.py:258 +#: ../DistUpgrade/DistUpgradeControler.py:263 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -291,21 +291,21 @@ msgstr "" "\n" "需要加入預設的 '%s' 項目嗎？如果你選擇「否」，更新將會被取消。" -#: ../DistUpgrade/DistUpgradeControler.py:292 +#: ../DistUpgrade/DistUpgradeControler.py:297 msgid "Repository information invalid" msgstr "無效的套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升級套件庫時導致無效的檔案。請匯報問題。" -#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Third party sources disabled" msgstr "停用第三方來源" -#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:305 #, fuzzy msgid "" "Some third party entries in your sources.list were disabled. You can re-" @@ -315,21 +315,21 @@ msgstr "" "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-" "properties' 工具或 synaptic升級後，你可以重新啟用它。" -#: ../DistUpgrade/DistUpgradeControler.py:349 +#: ../DistUpgrade/DistUpgradeControler.py:354 msgid "Error during update" msgstr "更新時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:350 +#: ../DistUpgrade/DistUpgradeControler.py:355 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:359 +#: ../DistUpgrade/DistUpgradeControler.py:364 msgid "Not enough free disk space" msgstr "磁碟空間不足" -#: ../DistUpgrade/DistUpgradeControler.py:360 +#: ../DistUpgrade/DistUpgradeControler.py:365 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -340,15 +340,15 @@ msgstr "" "clean'來移除先前安裝套件時的暫存檔。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:419 +#: ../DistUpgrade/DistUpgradeControler.py:424 msgid "Do you want to start the upgrade?" msgstr "是否要開始升級？" -#: ../DistUpgrade/DistUpgradeControler.py:439 +#: ../DistUpgrade/DistUpgradeControler.py:444 msgid "Could not install the upgrades" msgstr "無法安裝升級" -#: ../DistUpgrade/DistUpgradeControler.py:440 +#: ../DistUpgrade/DistUpgradeControler.py:445 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -360,77 +360,77 @@ msgstr "" "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --" "configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:458 +#: ../DistUpgrade/DistUpgradeControler.py:463 msgid "Could not download the upgrades" msgstr "無法下載升級套件" -#: ../DistUpgrade/DistUpgradeControler.py:459 +#: ../DistUpgrade/DistUpgradeControler.py:464 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升級現正中止。請檢查網路連線是否正常及再試 " -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:500 msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:496 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "" "Canonical Ltd. no longer provides support for the following software " "packages. You can still get support from the community.\n" "\n" -"If you havn't enabled community maintained software (universe), these " +"If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:531 +#: ../DistUpgrade/DistUpgradeControler.py:536 msgid "Remove obsolete packages?" msgstr "移除不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Skip This Step" msgstr "略過這步驟(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:532 +#: ../DistUpgrade/DistUpgradeControler.py:537 msgid "_Remove" msgstr "移除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:542 +#: ../DistUpgrade/DistUpgradeControler.py:547 msgid "Error during commit" msgstr "提交時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:543 +#: ../DistUpgrade/DistUpgradeControler.py:548 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:553 +#: ../DistUpgrade/DistUpgradeControler.py:560 msgid "Restoring original system state" msgstr "恢復原先的系統狀態" -#: ../DistUpgrade/DistUpgradeControler.py:609 +#: ../DistUpgrade/DistUpgradeControler.py:616 #, python-format msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:644 -#: ../DistUpgrade/DistUpgradeControler.py:677 +#: ../DistUpgrade/DistUpgradeControler.py:651 +#: ../DistUpgrade/DistUpgradeControler.py:686 msgid "Checking package manager" msgstr "正在檢查套件管理程式" -#: ../DistUpgrade/DistUpgradeControler.py:663 +#: ../DistUpgrade/DistUpgradeControler.py:672 msgid "Updating repository information" msgstr "正在更新套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:688 +#: ../DistUpgrade/DistUpgradeControler.py:697 msgid "Invalid package information" msgstr "無效的套件資訊" -#: ../DistUpgrade/DistUpgradeControler.py:689 +#: ../DistUpgrade/DistUpgradeControler.py:698 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -440,19 +440,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:701 +#: ../DistUpgrade/DistUpgradeControler.py:710 msgid "Asking for confirmation" msgstr "詢問以確認" -#: ../DistUpgrade/DistUpgradeControler.py:705 +#: ../DistUpgrade/DistUpgradeControler.py:714 msgid "Upgrading" msgstr "升級中" -#: ../DistUpgrade/DistUpgradeControler.py:712 +#: ../DistUpgrade/DistUpgradeControler.py:721 msgid "Searching for obsolete software" msgstr "尋搜不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:717 +#: ../DistUpgrade/DistUpgradeControler.py:726 msgid "System upgrade is complete." msgstr "系統升級完成。" @@ -581,7 +581,7 @@ msgstr "避免遺失請關閉所有已開啟的程式及文件。" #. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:604 msgid "Your system is up-to-date" msgstr "系統已經在最新狀態" @@ -810,15 +810,15 @@ msgid "" "or with the server. " msgstr "認證升級套件失敗。可能是因為跟伺服器的網路連線出現問題。 " -#: ../UpdateManager/GtkProgress.py:107 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../UpdateManager/GtkProgress.py:108 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" -#: ../UpdateManager/GtkProgress.py:111 -#, python-format -msgid "Downloading file %li of %li with unknown speed" -msgstr "正在下載檔案 %li/%li，下載速度不明" +#: ../UpdateManager/GtkProgress.py:113 +#, fuzzy, python-format +msgid "Downloading file %(current)li of %(total)li" +msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" #: ../UpdateManager/UpdateManager.py:204 #, fuzzy @@ -858,8 +858,8 @@ msgstr "" #: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Normal updates" -msgstr "安裝更新套件(_I)" +msgid "Distribution updates" +msgstr "繼續升級(_R)" #. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 @@ -873,87 +873,66 @@ msgid "Version %s: \n" msgstr "版本 %s： \n" #: ../UpdateManager/UpdateManager.py:521 -msgid "Downloading the list of changes..." +#, fuzzy +msgid "Downloading list of changes..." msgstr "正在下載修改紀錄..." -#: ../UpdateManager/UpdateManager.py:545 +#: ../UpdateManager/UpdateManager.py:548 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:554 #, fuzzy msgid "_Check All" msgstr "檢查(_C)" -#. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:582 -msgid "None" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:585 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:588 -#, python-format -msgid "%.0f KB" -msgstr "" - -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:591 -#, python-format -msgid "%.1f MB" -msgstr "" - #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 +#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619 #, python-format msgid "Download size: %s" msgstr "下載大小：%s" -#: ../UpdateManager/UpdateManager.py:629 +#: ../UpdateManager/UpdateManager.py:615 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "您可以安裝 %s 個更新" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:648 msgid "Please wait, this can take some time." msgstr "請稍候，這可能需要一點時間。" -#: ../UpdateManager/UpdateManager.py:664 +#: ../UpdateManager/UpdateManager.py:650 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:715 +#: ../UpdateManager/UpdateManager.py:701 #, fuzzy msgid "Checking for updates" msgstr "安裝更新套件(_I)" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:808 #, fuzzy, python-format -msgid "From version %s to %s" +msgid "From version %(old_version)s to %(new_version)s" msgstr "新版本：%s （大小：%s）" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:812 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:814 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:839 +#: ../UpdateManager/UpdateManager.py:825 msgid "Your distribution is not supported anymore" msgstr "您正使用的發行版本已不再支援" -#: ../UpdateManager/UpdateManager.py:840 +#: ../UpdateManager/UpdateManager.py:826 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 " @@ -962,17 +941,17 @@ msgstr "" "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 " "http://www.ubuntu.com以取得更多升級資訊。" -#: ../UpdateManager/UpdateManager.py:859 +#: ../UpdateManager/UpdateManager.py:845 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>有新的 distribution 發行版 '%s'</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:880 msgid "Software index is broken" msgstr "軟體索引損壞" -#: ../UpdateManager/UpdateManager.py:895 +#: ../UpdateManager/UpdateManager.py:881 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 " @@ -981,12 +960,35 @@ msgstr "" "不能安裝或移除任何套件。請先使用套件管理程式“Synaptic”或在終端機中執行“sudo " "apt-get install -f”來修正問題。" +#. TRANSLATORS: download size is 0 +#: ../UpdateManager/Common/utils.py:33 +msgid "None" +msgstr "" + +#. TRANSLATORS: download size of very small updates +#: ../UpdateManager/Common/utils.py:36 +msgid "1 KB" +msgstr "" + +#. TRANSLATORS: download size of small updates, e.g. "250 KB" +#: ../UpdateManager/Common/utils.py:39 +#, python-format +msgid "%.0f KB" +msgstr "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../UpdateManager/Common/utils.py:42 +#, python-format +msgid "%.1f MB" +msgstr "" + #: ../data/glade/UpdateManager.glade.h:1 +#, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " -"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab." msgstr "" "<b><big>您必須自行檢查更新</big></b>\n" "\n" @@ -1010,34 +1012,30 @@ msgid "<big><b>Starting update manager</b></big>" msgstr "<b><big>開始升級？</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Cancel _Download" -msgstr "取消下載(_D)" - -#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "修改紀錄" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Chec_k" msgstr "檢查(_K)" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Check the software channels for new updates" msgstr "檢查軟體來源有沒有更新套件" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Description" msgstr "詳細說明" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Release Notes" msgstr "發行說明" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "" "Run a distribution upgrade, to install as many updates as possible. \n" "\n" @@ -1045,51 +1043,51 @@ msgid "" "or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" msgstr "顯示單一檔案的進度" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Software Updates" msgstr "軟體更新" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:18 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "軟體更新會更正錯誤, 排除安全弱點, 並提功新功能." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" msgstr "升級(_P)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:20 msgid "Upgrade to the latest version of Ubuntu" msgstr "升級到最新版本的 Ubuntu" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Check" msgstr "檢查(_C)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Distribution Upgrade" msgstr "繼續升級(_R)" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:23 msgid "_Hide this information in the future" msgstr "以後不要再顯示此訊息(_H)" -#: ../data/glade/UpdateManager.glade.h:25 +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Install Updates" msgstr "安裝更新套件(_I)" -#: ../data/glade/UpdateManager.glade.h:26 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "changes" msgstr "修改紀錄" -#: ../data/glade/UpdateManager.glade.h:27 +#: ../data/glade/UpdateManager.glade.h:26 msgid "updates" msgstr "" @@ -1123,76 +1121,81 @@ msgid "" msgstr "" #: ../data/glade/SoftwareProperties.glade.h:9 +#, fuzzy +msgid "Add Cdrom" +msgstr "加入光碟(_C)" + +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "Authentication" msgstr "認證" -#: ../data/glade/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:11 msgid "D_elete downloaded software files:" msgstr "刪除已下載的軟體檔案(_E)：" -#: ../data/glade/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Download from:" msgstr "下載完成" -#: ../data/glade/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Import the public key from a trusted software provider" msgstr "匯入您信任的軟體供應商的公鑰" -#: ../data/glade/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "Internet Updates" msgstr "線上更新" -#: ../data/glade/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "只有來自 Ubuntu 官方伺服器的安全性更新會自動安裝" -#: ../data/glade/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" msgstr "還原為預設值(_D)" -#: ../data/glade/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:17 msgid "Restore the default keys of your distribution" msgstr "還原為發行版本預設的金鑰" -#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:18 #: ../data/software-properties.desktop.in.h:2 #, fuzzy msgid "Software Sources" msgstr "軟體屬性" -#: ../data/glade/SoftwareProperties.glade.h:18 +#: ../data/glade/SoftwareProperties.glade.h:19 msgid "Source code" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:19 +#: ../data/glade/SoftwareProperties.glade.h:20 msgid "Statistics" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:20 +#: ../data/glade/SoftwareProperties.glade.h:21 msgid "Submit statistical information" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:21 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "Third Party" msgstr "" -#: ../data/glade/SoftwareProperties.glade.h:22 +#: ../data/glade/SoftwareProperties.glade.h:23 msgid "_Check for updates automatically:" msgstr "自動檢查更新(_C)：" -#: ../data/glade/SoftwareProperties.glade.h:23 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Download updates automatically, but do not install them" msgstr "在背景下載更新套件，但無須安裝(_D)" -#: ../data/glade/SoftwareProperties.glade.h:24 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Import Key File" msgstr "匯入金鑰" -#: ../data/glade/SoftwareProperties.glade.h:25 +#: ../data/glade/SoftwareProperties.glade.h:26 msgid "_Install security updates without confirmation" msgstr "無須確認便安裝安全性更新(_I)" @@ -1578,6 +1581,16 @@ msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體" msgid "Non-DFSG-compatible Software" msgstr "不符合 DFSG 的軟體" +#~ msgid "Downloading file %li of %li with unknown speed" +#~ msgstr "正在下載檔案 %li/%li，下載速度不明" + +#, fuzzy +#~ msgid "Normal updates" +#~ msgstr "安裝更新套件(_I)" + +#~ msgid "Cancel _Download" +#~ msgstr "取消下載(_D)" + #~ msgid "Some software no longer officially supported" #~ msgstr "有些軟體不再有官方支援" @@ -1657,9 +1670,6 @@ msgstr "不符合 DFSG 的軟體" #~ msgid "<b>Keys</b>" #~ msgstr "<b>金鑰</b>" -#~ msgid "Add _Cdrom" -#~ msgstr "加入光碟(_C)" - #~ msgid "Installation Media" #~ msgstr "安裝媒體" diff --git a/utils/demoted.cfg b/utils/demoted.cfg index 111ed3d3..c619ea69 100644 --- a/utils/demoted.cfg +++ b/utils/demoted.cfg @@ -1,331 +1,42 @@ -# demoted packages in dapper -base-config -bazaar -bonobo -cfengine-doc -cpp-3.3-doc -cyrus21-admin -cyrus21-clients -cyrus21-common -cyrus21-dev -cyrus21-doc -cyrus21-imapd -cyrus21-murder -cyrus21-pop3d -dasher -drac-dev -gcj-4.0 -gconf -gdk-imlib1 -gij-4.0 -glade-common-2 -glife -gnome-bin -gnome-dev-doc -gnome-libs-data -gossip -gstreamer0.8-aa -gstreamer0.8-alsa -gstreamer0.8-artsd -gstreamer0.8-audiofile -gstreamer0.8-caca -gstreamer0.8-cdparanoia -gstreamer0.8-doc -gstreamer0.8-dv -gstreamer0.8-dvd -gstreamer0.8-esd -gstreamer0.8-festival -gstreamer0.8-flac -gstreamer0.8-gnomevfs -gstreamer0.8-gsm -gstreamer0.8-hermes -gstreamer0.8-jpeg -gstreamer0.8-mikmod -gstreamer0.8-misc -gstreamer0.8-musepack -gstreamer0.8-oss -gstreamer0.8-plugin-apps -gstreamer0.8-sdl -gstreamer0.8-sid -gstreamer0.8-speex -gstreamer0.8-theora -gstreamer0.8-tools -gstreamer0.8-vorbis -gstreamer0.8-x -gtkglarea5 -gtkglarea5-dev -hermes1 -hermes1-dev -ifrename -imlib-base -initrd-tools -ivman -jackd -jikes -kerberos4kth-dev -konserve -kuser -kwifimanager -laptop-mode -lib32gcj6 -liba52-0.7.4 -liba52-0.7.4-dev -libart-dev -libart2 -libaspell15c2 -libbonobo-dev -libbonobo2 -libcrimson-java -libcrimson-java-doc -libcyrus-imap-perl21 -libdb1-compat -libdirectfb-0.9-22 -libdirectfb-dev -libdts-dev -libefs-dev -libefs1 -libesd0 -libgcj6 -libgcj6-awt -libgcj6-dev -libgconf-cil -libgconf-dev -libgconf11 -libgd-dev -libgd-noxpm-dev -libgd-xpm-dev -libgd1-noxpm -libgd1-xpm -libgdchart-gd1-noxpm -libgdchart-gd1-noxpm-dev -libgdchart-gd1-xpm -libgdchart-gd1-xpm-dev -libgdk-pixbuf-dev -libgdk-pixbuf-gnome-dev -libgdk-pixbuf-gnome2 -libgdk-pixbuf2 -libggi-target-x -libggi2 -libggi2-dev -libgii0 -libgii0-dev -libgii0-target-x -libglade-cil -libglade-gnome0 -libglade-gnome0-dev -libglade0 -libglade0-dev -libglib-cil -libglide2 -libglide2-dev -libglide3 -libglide3-dev -libgnome-cil -libgnome-dev -libgnome32 -libgnomeprint-bin -libgnomeprint-data -libgnomeprint-dev -libgnomeprint15 -libgnomesupport0 -libgnomeui32 -libgnorba-dev -libgnorba27 -libgnorbagtk0 -libgnutls11 -libgnutls11-dev -libgstreamer-gconf0.8-0 -libgstreamer-gconf0.8-dev -libgstreamer-plugins0.8-0 -libgstreamer-plugins0.8-dev -libgstreamer0.8-0 -libgstreamer0.8-dev -libgtk-cil -libgtkxmhtml-dev -libgtkxmhtml1 -libkadm1-kerberos4kth -libkafs0-kerberos4kth -libkdb-1-kerberos4kth -libkpathsea-dev -libkpathsea3 -libkrb-1-kerberos4kth -libkthacl1-kerberos4kth -libloudmouth1-0 -libloudmouth1-dev -libmms-dev -libmms0 -libmpeg-dev -libmpeg-doc -libmpeg1 -libmpeg2-4 -libmpeg2-4-dev -libmpeg3-1 -libmpeg3-dev -libmysqlclient10 -libmysqlclient10-dev -libmysqlclient12 -libmysqlclient12-dev -libmysqlclient14 -libmysqlclient14-dev -libneon24 -libneon24-dev -libnetpbm9 -libnetpbm9-dev -liboaf-dev -liboaf0 -libopenal-dev -libopenal0 -libopenh323-dbg -libopenh323-dev -libopenh323-doc -liborbit-dev -liborbit0 -libosmesa6 -libosmesa6-dev -libotp0-kerberos4kth -libpixman1 -libpng3-dev -libpq3 -libpsiconv-dev -libpsiconv5 -libpth-dbg -libpth-dev -libpth2 -libreadline4 -libroken16-kerberos4kth -libsablot0 -libsablot0-dev -libsidplay1 -libsidplay1-dev -libsigc++-1.2-5c2 -libsigc++-1.2-dev -libsl0-kerberos4kth -libsnmp4.2 -libsnmp4.2-dev -libss0-kerberos4kth -libssl0.9.7 -libstdc++5-3.3-dbg -libstdc++5-3.3-doc -libswfdec0.3 -libswfdec0.3-dev -libwww-dev -libwww-ssl-dev -libwww-ssl0 -libxine1c2 -libxosd-dev -libxosd2 -libxp-java -libzvt-dev -libzvt2 -mozilla-browser -mozilla-dev -mozilla-locale-ca -mozilla-locale-cy -mozilla-locale-da -mozilla-locale-de-at -mozilla-locale-el -mozilla-locale-es-es -mozilla-locale-eu -mozilla-locale-fr -mozilla-locale-hu -mozilla-locale-it -mozilla-locale-ja -mozilla-locale-ko -mozilla-locale-lt -mozilla-locale-no-nb -mozilla-locale-pl -mozilla-locale-ptbr -mozilla-locale-sl -mozilla-locale-tr -mozilla-psm -mpack -multiseat -oaf -orbit -passivetex -plone -plone-site -postgresql -postgresql-7.4 -postgresql-8.0 -postgresql-client -postgresql-client-7.4 -postgresql-client-8.0 -postgresql-contrib -postgresql-contrib-7.4 -postgresql-contrib-8.0 -postgresql-dev -postgresql-doc -postgresql-doc-7.4 -postgresql-doc-8.0 -postgresql-plperl-7.4 -postgresql-plperl-8.0 -postgresql-plpython-7.4 -postgresql-plpython-8.0 -postgresql-pltcl-7.4 -postgresql-pltcl-8.0 -python-gdchart -python-gst -python-opengl -python-osd -python-sip4-qt3 -python2.3 -python2.3-dev -python2.3-imaging -python2.3-tk -python2.3-xml -python2.4-opengl -python2.4-osd -sane-utils -tspc -ubuntu-express -vim-gtk -xchat -xchat-common -xmltex -xserver-xorg-input-acecad -xserver-xorg-input-aiptek -xserver-xorg-input-calcomp -xserver-xorg-input-citron -xserver-xorg-input-digitaledge -xserver-xorg-input-dmc -xserver-xorg-input-dynapro -xserver-xorg-input-fpit -xserver-xorg-input-hyperpen -xserver-xorg-input-magellan -xserver-xorg-input-microtouch -xserver-xorg-input-mutouch -xserver-xorg-input-palmax -xserver-xorg-input-penmount -xserver-xorg-input-spaceorb -xserver-xorg-input-summa -xserver-xorg-input-tek4957 -xserver-xorg-input-void -zope-atcontenttypes -zope-atrbw -zope-btreefolder2 -zope-cmf1.5 -zope-cmfactionicons1.5 -zope-cmfcalendar1.5 -zope-cmfcore1.5 -zope-cmfdefault1.5 -zope-cmfdynamicviewfti -zope-cmfformcontroller -zope-cmfplone -zope-cmfquickinstallertool -zope-cmfsetup1.5 -zope-cmftopic1.5 -zope-cmfuid1.5 -zope-dcworkflow1.5 -zope-extendedpathindex -zope-groupuserfolder -zope-kupu -zope-linguaplone -zope-ploneerrorreporting -zope-plonelanguagetool -zope-plonetranslations -zope-pts -zope-resourceregistries -zope-securemailhost -zope2.8 -zope2.8-sandbox
\ No newline at end of file +# demoted packages +blender +bluez-pcmcia-support +courier-authdaemon +courier-base +courier-doc +courier-imap +courier-imap-ssl +courier-pop +courier-pop-ssl +courier-ssl +ftgl-dev +lam4-dev +lam4c2 +libgd-gd2-noxpm-perl +libgmime2.1 +libgmime2.1-cil +libgnutls12 +libmpich1.0-dev +libmpich1.0c2 +libnetcdf++3 +libnetcdf3 +libpgtcl-dev +libpgtcl1.5 +libreiserfs0.3-0 +libreiserfs0.3-dbg +libreiserfs0.3-dev +libunicode-string-perl +libxaw6 +libxaw6-dbg +mono-classlib-2.0 +mpi-doc +mpich-bin +netcdfg-dev +python-netcdf +python-parted +python-pgsql +python-scientific-doc +sdf-doc +tcl8.0 +tcl8.0-dev +tk8.0 diff --git a/utils/demotions.py b/utils/demotions.py index 78f4f2e7..45a1397b 100755 --- a/utils/demotions.py +++ b/utils/demotions.py @@ -43,11 +43,11 @@ if __name__ == "__main__": except OSError: pass - breezy = Dist("breezy") - dapper = Dist("dapper") + old = Dist("dapper") + new = Dist("edgy") # go over the dists to find main pkgs - for dist in [breezy, dapper]: + for dist in [old, new]: for comp in ["main", "restricted", "universe", "multiverse"]: line = "deb http://archive.ubuntu.com/ubuntu %s %s\n" % (dist.name,comp) @@ -64,11 +64,11 @@ if __name__ == "__main__": map(lambda pkg: dist.pkgs_in_comp[comp].add(pkg.name), cache) # check what is no longer in main - no_longer_main = breezy.pkgs_in_comp["main"] - dapper.pkgs_in_comp["main"] - no_longer_main |= breezy.pkgs_in_comp["restricted"] - dapper.pkgs_in_comp["restricted"] + no_longer_main = old.pkgs_in_comp["main"] - new.pkgs_in_comp["main"] + no_longer_main |= old.pkgs_in_comp["restricted"] - new.pkgs_in_comp["restricted"] # check what moved to universe and what was removed (or renamed) - in_universe = lambda pkg: pkg in dapper.pkgs_in_comp["universe"] or pkg in dapper.pkgs_in_comp["multiverse"] + in_universe = lambda pkg: pkg in new.pkgs_in_comp["universe"] or pkg in new.pkgs_in_comp["multiverse"] # debug #not_in_universe = lambda pkg: not in_universe(pkg) @@ -82,5 +82,5 @@ if __name__ == "__main__": print "writing the demotion info to '%s'" % outfile # write it out out = open(outfile,"w") - out.write("# demoted packages in dapper\n") + out.write("# demoted packages\n") out.write("\n".join(demoted)) |