From b9d9d686af1fc980482b5d0b23c5d29194e35136 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Sep 2006 20:33:48 +0200 Subject: * debian/changelog, debian/dirs - fix missing /var/log/dist-upgrade --- debian/changelog | 6 ++++++ debian/dirs | 1 + 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3012c6d4..48c59ad8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.44.8) edgy; urgency=low + + * fix missing /var/log/dist-upgrade + + -- Michael Vogt Fri, 8 Sep 2006 20:33:04 +0200 + update-manager (0.44.7) edgy; urgency=low * UpdateManager/UpdateManager.py: diff --git a/debian/dirs b/debian/dirs index 83916ddf..635898db 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,3 @@ var/lib/update-manager +var/log/dist-upgrade usr/bin \ No newline at end of file -- cgit v1.2.3 From e4b06af1ace3bbb4281a9c762113f8a2699116c3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 9 Sep 2006 10:53:25 +0200 Subject: * merged with the latest upload (fix popcon participate value) --- SoftwareProperties/SoftwareProperties.py | 24 ++++++++++++++++++++---- debian/changelog | 7 +++++++ 2 files changed, 27 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index a3dfdd06..a18fec20 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -79,6 +79,7 @@ class SoftwareProperties(SimpleGladeApp): def __init__(self, datadir=None, options=None, parent=None, file=None): gtk.window_set_default_icon_name("software-properties") + self.popconfile = "/etc/popularity-contest.conf" # FIXME: some saner way is needed here if datadir == None: @@ -223,6 +224,22 @@ class SoftwareProperties(SimpleGladeApp): self.treeview_sources.connect("drag_data_received",\ self.on_sources_drag_data_received) + # popcon + if os.path.exists(self.popconfile): + # read it + lines = open(self.popconfile).read().split("\n") + active = False + for line in lines: + try: + (key,value) = line.split("=") + if key == "PARTICIPATE": + if value.strip('"').lower() == "yes": + active = True + except ValueError: + continue + self.checkbutton_popcon.set_active(active) + + # call the add sources.list dialog if we got a file from the cli if self.file != None: self.open_file(file) @@ -505,14 +522,13 @@ class SoftwareProperties(SimpleGladeApp): def on_checkbutton_popcon_toggled(self, widget): """ The user clicked on the popcon paritipcation button """ - popcon = "/etc/popularity-contest.conf" if widget.get_active(): new_value = "yes" else: new_value = "no" - if os.path.exists(popcon): + if os.path.exists(self.popconfile): # read it - lines = open(popcon).read().split("\n") + lines = open(self.popconfile).read().split("\n") for line in lines: try: (key,value) = line.split("=") @@ -521,7 +537,7 @@ class SoftwareProperties(SimpleGladeApp): except ValueError: continue # write it - open(popcon,"w").write("\n".join(lines)) + open(self.popconfile,"w").write("\n".join(lines)) def open_file(self, file): diff --git a/debian/changelog b/debian/changelog index 48c59ad8..230fd67f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.44.9) edgy; urgency=low + + * SoftwareProperties/SoftwareProperties.py: + - bugfix in the popcon enable code (lp: #59540) + + -- Michael Vogt Sat, 9 Sep 2006 02:13:40 +0200 + update-manager (0.44.8) edgy; urgency=low * fix missing /var/log/dist-upgrade -- cgit v1.2.3 From a021109da0fb1e138adc912c44632f0956243769 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 10 Sep 2006 12:02:11 +0200 Subject: * added new "MirrorsFile" keyword for the DistInfo Tagfile * look for mirros as well when matching distros --- TODO | 2 + UpdateManager/Common/DistInfo.py | 11 +- UpdateManager/Common/aptsources.py | 17 ++- data/channels/Ubuntu.info | 52 ++++--- data/channels/Ubuntu.info.in | 62 +++++--- debian/changelog | 9 ++ po/ar.po | 234 +++++++++++++++------------- po/bg.po | 248 ++++++++++++++++-------------- po/bn.po | 235 ++++++++++++++++------------- po/br.po | 234 +++++++++++++++------------- po/ca.po | 248 ++++++++++++++++-------------- po/cs.po | 239 ++++++++++++++++------------- po/da.po | 239 ++++++++++++++++------------- po/de.po | 248 ++++++++++++++++-------------- po/el.po | 239 ++++++++++++++++------------- po/en_AU.po | 239 ++++++++++++++++------------- po/en_CA.po | 248 ++++++++++++++++-------------- po/en_GB.po | 248 ++++++++++++++++-------------- po/es.po | 248 ++++++++++++++++-------------- po/fi.po | 248 ++++++++++++++++-------------- po/fr.po | 248 ++++++++++++++++-------------- po/fur.po | 234 +++++++++++++++------------- po/gl.po | 248 ++++++++++++++++-------------- po/he.po | 248 ++++++++++++++++-------------- po/hi.po | 234 +++++++++++++++------------- po/hr.po | 239 ++++++++++++++++------------- po/hu.po | 239 ++++++++++++++++------------- po/id.po | 239 ++++++++++++++++------------- po/it.po | 248 ++++++++++++++++-------------- po/ja.po | 248 ++++++++++++++++-------------- po/ka.po | 235 ++++++++++++++++------------- po/ko.po | 239 ++++++++++++++++------------- po/ku.po | 235 ++++++++++++++++------------- po/lt.po | 239 ++++++++++++++++------------- po/mk.po | 248 ++++++++++++++++-------------- po/ms.po | 234 +++++++++++++++------------- po/nb.po | 248 ++++++++++++++++-------------- po/ne.po | 248 ++++++++++++++++-------------- po/nl.po | 239 ++++++++++++++++------------- po/no.po | 248 ++++++++++++++++-------------- po/oc.po | 235 ++++++++++++++++------------- po/pa.po | 234 +++++++++++++++------------- po/pl.po | 248 ++++++++++++++++-------------- po/pt.po | 239 ++++++++++++++++------------- po/pt_BR.po | 248 ++++++++++++++++-------------- po/ro.po | 248 ++++++++++++++++-------------- po/ru.po | 239 ++++++++++++++++------------- po/rw.po | 242 +++++++++++++++-------------- po/sk.po | 248 ++++++++++++++++-------------- po/sr.po | 234 +++++++++++++++------------- po/sv.po | 251 +++++++++++++++++-------------- po/th.po | 239 ++++++++++++++++------------- po/tr.po | 235 ++++++++++++++++------------- po/uk.po | 248 ++++++++++++++++-------------- po/update-manager.pot | 234 +++++++++++++++------------- po/ur.po | 234 +++++++++++++++------------- po/urd.po | 234 +++++++++++++++------------- po/vi.po | 248 ++++++++++++++++-------------- po/xh.po | 234 +++++++++++++++------------- po/zh_CN.po | 248 ++++++++++++++++-------------- po/zh_HK.po | 248 ++++++++++++++++-------------- po/zh_TW.po | 239 ++++++++++++++++------------- tests/data/sources.list.testDistribution | 4 +- tests/test_aptsources.py | 13 +- 64 files changed, 7498 insertions(+), 6212 deletions(-) (limited to 'debian') diff --git a/TODO b/TODO index 72acb345..588e7a8a 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,8 @@ UpdateManager.Common.aptsources.py: - make the distro detection in sources.list more clever by using the origin informaton to avoid adding full uris to (unofficial/internal) mirrors +- make it possible to inherit the mirrros from a ParentSuite (for + the childs) Misc: - have a common error dialog readymade and rib out all those diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index 79d5356c..81f08200 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -24,6 +24,7 @@ import os import gettext from os import getenv import ConfigParser +import string _ = gettext.gettext @@ -38,6 +39,7 @@ class Suite: self.components = {} self.children = [] self.match_uri = None + self.valid_mirrors = [] self.distribution = None self.available = True @@ -107,6 +109,12 @@ class DistInfo: suite.match_uri = value elif field == 'MatchURI': suite.match_uri = value + elif field == 'MirrorsFile': + suite.valid_mirrors = filter(lambda s: + ((s != "") and + (not s.startswith("#"))), + map(string.strip, + open(value))) elif field == 'Description': suite.description = _(value) elif field == 'Component': @@ -133,13 +141,14 @@ class DistInfo: if __name__ == "__main__": - d = DistInfo ("Ubuntu", "../../channels") + d = DistInfo ("Ubuntu", "../../data/channels") print d.changelogs_uri for suite in d.suites: print "\nSuite: %s" % suite.name print "Desc: %s" % suite.description print "BaseURI: %s" % suite.base_uri print "MatchURI: %s" % suite.match_uri + print "Mirrors: %s" % suite.valid_mirrors for component in suite.components: print " %s - %s - %s - %s" % (component, suite.components[component][0], diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index 36a9811d..bc6886d9 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -87,7 +87,8 @@ class SourceEntry: file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") self.file = file # the file that the entry is located in self.parse(line) - self.template = None + # FIXME: this name is really misleading and already overloaded + self.template = None # type DistInfo.Suite self.children = [] def __eq__(self, other): @@ -457,12 +458,17 @@ class SourceEntryMatcher: _ = gettext.gettext found = False for template in self.templates: - #print "'%s'" %source.uri - if re.search(template.match_uri, source.uri) and \ - re.match(template.match_name, source.dist): + if (re.search(template.match_uri, source.uri) and + re.match(template.match_name, source.dist)): found = True source.template = template break + for mirror in template.valid_mirrors: + if (is_mirror(mirror,source.uri) and + re.match(template.match_name, source.dist)): + found = True + source.template = template + break return found class Distribution: @@ -717,3 +723,6 @@ if __name__ == "__main__": print is_mirror("http://archive.ubuntu.com/ubuntu", "http://de.archive.ubuntu.com/ubuntu/") + print is_mirror("http://archive.ubuntu.com/ubuntu/", + "http://de.archive.ubuntu.com/ubuntu") + diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info index 2620a7da..93ec83d2 100644 --- a/data/channels/Ubuntu.info +++ b/data/channels/Ubuntu.info @@ -3,7 +3,8 @@ ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/change Suite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.10 'Edgy Eft' Component: main Enabled: 1 @@ -38,34 +39,35 @@ Suite: edgy-security ParentSuite: edgy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Important security updates Suite: edgy-updates ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Proposed updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Backported updates Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main Enabled: 1 @@ -100,34 +102,35 @@ Suite: dapper-security ParentSuite: dapper RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Proposed updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Backported updates Suite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.10 'Breezy Badger' Component: main Enabled: 1 @@ -158,27 +161,28 @@ Suite: breezy-security ParentSuite: breezy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Ubuntu 5.10 Security Updates Suite: breezy-updates ParentSuite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.10 Updates Suite: breezy-backports ParentSuite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.10 Backports Suite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main Enabled: 1 @@ -209,31 +213,31 @@ Suite: hoary-security ParentSuite: hoary RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Ubuntu 5.04 Security Updates Suite: hoary-updates ParentSuite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.04 Updates Suite: hoary-backports ParentSuite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.04 Backports Suite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 'Warty Warthog' Component: main Enabled: 1 -CompDescription: Oficially supported +CompDescription: No longer oficially supported Component: restricted Enabled: 1 CompDescription: Restricted copyright @@ -251,7 +255,7 @@ Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main Enabled: 1 -CompDescription: Oficially supported +CompDescription: No longer oficially supported Component: restricted Enabled: 1 CompDescription: Restricted copyright @@ -260,19 +264,19 @@ Suite: warty-security ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com Description: Ubuntu 4.10 Security Updates Suite: warty-updates ParentSuite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 Updates Suite: warty-backports ParentSuite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 Backports diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index ed7fd50c..2b20cf8f 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -3,7 +3,8 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.10 'Edgy Eft' Component: main Enabled: 1 @@ -38,34 +39,39 @@ Suite: edgy-security ParentSuite: edgy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Important security updates Suite: edgy-updates ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Proposed updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Backported updates Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main Enabled: 1 @@ -100,34 +106,39 @@ Suite: dapper-security ParentSuite: dapper RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Proposed updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Backported updates Suite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 'Breezy Badger' Component: main Enabled: 1 @@ -158,27 +169,31 @@ Suite: breezy-security ParentSuite: breezy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Security Updates Suite: breezy-updates ParentSuite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Updates Suite: breezy-backports ParentSuite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Backports Suite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main Enabled: 1 @@ -209,27 +224,30 @@ Suite: hoary-security ParentSuite: hoary RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Security Updates Suite: hoary-updates ParentSuite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Updates Suite: hoary-backports ParentSuite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Backports Suite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 'Warty Warthog' Component: main Enabled: 1 @@ -260,19 +278,19 @@ Suite: warty-security ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com _Description: Ubuntu 4.10 Security Updates Suite: warty-updates ParentSuite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 Updates Suite: warty-backports ParentSuite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 Backports diff --git a/debian/changelog b/debian/changelog index 230fd67f..d83e1323 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +update-manager (0.44.10) edgy; urgency=low + + * aptsources.py: + - fix add_component() to avoid duplicated components + - added MirrorsFile key to DistInfo code to have a better idea + about the available mirrors + + -- Michael Vogt Sun, 10 Sep 2006 00:01:29 +0200 + update-manager (0.44.9) edgy; urgency=low * SoftwareProperties/SoftwareProperties.py: diff --git a/po/ar.po b/po/ar.po index 63d4fa85..5a87efcd 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi \n" "Language-Team: Arabic \n" @@ -17,108 +17,116 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n == 2 ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "يوميا" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "كل يومين" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "اسبوعي" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "كل اسبوعين" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "كل %s يوم" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "بعد اسبوع" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "بعد اسبوعين" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "بعد شهر" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "بعد %s يوم" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "خطاء في استيراد الملف" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "خطاء في ازالة المفتاح" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "الرجاء ادخال اسم القرص" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "الرجاء ادخال القرص في الجهاز" @@ -759,110 +767,110 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -870,52 +878,52 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1233,183 +1241,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/bg.po b/po/bg.po index e41fb871..d81f750b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" @@ -17,113 +17,121 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Ежедневно" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Всеки два дни" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Ежеседмично" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Всеки две седмици" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Всеки %s дни" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "След една седмица" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "След две седмици" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "След един месец" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "След %s дни" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Инсталиране на актуализациите" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Обновления на софтуера" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Изходен код" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Изходен код" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Внасяне на ключ" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Грешка при внасяне на избрания файл" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Избраният файл или не е GPG файл, или е повреден." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Грешка при премахване на ключа" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключът, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -134,11 +142,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Моля, въведете име за диска" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Моля, поставете диск в устройството:" @@ -843,16 +851,16 @@ msgstr "Сваляне на файл %li от %li при %s/сек" msgid "Downloading file %li of %li with unknown speed" msgstr "Сваляне на файл %li от %li при неизвестна скорост" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -860,134 +868,134 @@ msgstr "" "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет " "връзката си." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 актуализации на сигурността" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Надграждане до последната версия на Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Инсталиране на актуализациите" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Не могат да бъдат инсталирани всички актуализации" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Сваляне на списъка с промени..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Размер за изтегляне: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Системата Ви е актуална" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Можете да инсталирате %s актуализация" msgstr[1] "Можете да инсталирате %s актуализации" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Моля, изчакайте! Това може да отнеме известно време." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Актуализацията е завършена" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Нова версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуция вече не се поддържа" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -997,17 +1005,17 @@ msgstr "" "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com " "за повече информация за надграждането!" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Индексът на софтуера е повреден" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1372,202 +1380,220 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 актуализации" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Поддържани от обществото (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Допринесен софтуер" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Поддържани от обществото (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Несвободни (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Несвободни (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Ограничен за изнасяне от САЩ софтуер" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Инсталиране на актуализациите" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официално поддържани" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 актуализации" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Състарени версии" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Официално поддържан" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 актуализации" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Състарени версии" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Несвободни (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Официално поддържан" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Ограничени авторски права" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 обновления по сигурността" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 обновления" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Състарени версии" @@ -1861,15 +1887,9 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "Binary" #~ msgstr "Двоични" -#~ msgid "Contributed software" -#~ msgstr "Допринесен софтуер" - #~ msgid "Non-free software" #~ msgstr "Несвободен софтуер" -#~ msgid "US export restricted software" -#~ msgstr "Ограничен за изнасяне от САЩ софтуер" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 „Woody“" diff --git a/po/bn.po b/po/bn.po index eb93ec84..110eeb8c 100644 --- a/po/bn.po +++ b/po/bn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" @@ -17,109 +17,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "দৈনিক" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "প্রত্যেক দুই দিনে" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "সাপ্তাহিক" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "প্রত্যেক দুই সপ্তাহে" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "প্রত্যেক %s দিনে" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "এক সপ্তাহ পর" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "দুই সপ্তাহ পর" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "এক মাস পর" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s দিন পর" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "সফ্টওয়্যার আপডেট" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "কী ইম্পোর্ট" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "নির্বাচিত ফাইলটি ইম্পোর্ট করতে সমস্যা হয়েছে" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "বেছে নেয়া ফাইলটি মনে হয় কোন GPG কী ফাইল নয় অথবা এটি নষ্ট।" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "কী সরাতে সমস্যা হয়েছে" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -130,11 +138,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "ডিস্কের জন্য একটি নাম দিন" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:" @@ -784,16 +792,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -801,151 +809,151 @@ msgid "" msgstr "" "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "ভার্সন %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "ডাউনলোড এর আকার: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "আপনার সিস্টেম আপ-টু-ডেট" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন" msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "আপডেট সম্পন্ন" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "নতুন ভার্সন: %s (আকার: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "ভার্সন %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1272,200 +1280,215 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "উবুন্টু ৫.১০ আপডেট" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "ফ্রি নয় (মাল্টিভার্স)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "আপডেট ইন্সটল করো (_I)" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "অফিসিয়াল ভাবে সমর্থিত" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "অফিসিয়াল ভাবে সমর্থিত" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" diff --git a/po/br.po b/po/br.po index 29126b80..644917da 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" @@ -17,112 +17,120 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Bep %s devezh" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "War-lerc'h %s devezh" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Emborzhiañ an alc'hwezh" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Fazi en ur emborzhiañ ar restr dibabet" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Fazi en ur zilemel an alc'hwezh" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -130,11 +138,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Roit un anv evit ar bladenn marplij" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Lakait ur bladenn e-barzh ul lenner marplij:" @@ -760,162 +768,162 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1234,183 +1242,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/ca.po b/po/ca.po index 74ac19db..cb40bdb5 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" @@ -16,115 +16,123 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Diàriament" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Cada dos dies" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Setmanalment" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Cada dues setmanes" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Cada %s dies" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Després d'una setmana" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Després de dues setmanes" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Després d'un mes" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Després de %s dies" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Instal·la les actualitzacions" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Actualitzacions de programari" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Font" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Font" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importa un clau" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "S'ha produït un error en importar el fitxer seleccionat" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "S'ha produït un error en esborrar la clau" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -135,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Introduïu un nom per al disc" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Inseriu un disc a la unitat:" @@ -821,16 +829,16 @@ msgstr "S'està descarregant el fitxer %li de %li amb %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "La llista de canvis encara no està disponible. Proveu-ho després." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "La llista de canvis encara no està disponible. Proveu-ho després." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -838,134 +846,134 @@ msgstr "" "S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió " "a Internet." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Debian Stable Security Updates" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Actualitza a la darrera versió d'Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Instal·la les actualitzacions" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "No es poden instal·lar les actualitzacions disponibles" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versió %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Mida de la descàrrega: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "El vostre sistema està actualitzat" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Espereu, això pot tardar una estona." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versió nova: %s (Mida: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versió %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "La vostra distribució ja no es mantindrà més" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +983,17 @@ msgstr "" "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més " "informació." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Ja disposeu de la nova distribució '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "L'índex de programari s'ha trencat" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1343,201 +1351,219 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualitzacions d'Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Paquets mantinguts per la comunitat (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Programari de la comunitat" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Paquets sense llicència lliure (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Programari amb restriccions d'exportació als EUA" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Debian Stable Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Instal·la les actualitzacions" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Paquets mantinguts oficialment (Main)" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Actualitzacions d'Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Paquets mantinguts oficialment (Main)" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "Actualitzacions d'Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Algun programari ja no es mantindrà oficialment" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Paquets amb restriccions per copyright (Restricted)" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Actualitzacions d'Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" @@ -1850,15 +1876,9 @@ msgstr "Programari no compatible DFSG" #~ msgid "Binary" #~ msgstr "Binari" -#~ msgid "Contributed software" -#~ msgstr "Programari de la comunitat" - #~ msgid "Non-free software" #~ msgstr "Programari sense llicència lliure" -#~ msgid "US export restricted software" -#~ msgstr "Programari amb restriccions d'exportació als EUA" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 \"Woody\"" diff --git a/po/cs.po b/po/cs.po index 16cb7f59..a2efb624 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála \n" "Language-Team: Czech \n" @@ -18,109 +18,117 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Denně" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Obden" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Týdně" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Každé dva týdny" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Každých %s dní" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Po týdnu" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Po dvou týdnech" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Po měsíci" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Po %s dnech" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Instaluji aktualizace" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Aktualizace softwaru" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importovat klíč" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Chyba při importování vybraného souboru" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Chyba při odstraňování klíče" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Prosím zadejte jméno disku" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Prosím vložte disk do mechaniky:" @@ -814,115 +822,115 @@ msgstr "Stahuji %li. soubor z %li rychlostí %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Stahuji %li. soubor z %li neznámou rychlostí" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "Selhalo stažení seznamu změn. Prosím zkontrolujte své internetové připojení." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Upgradovat na poslední verzi Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Instaluji aktualizace" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Nelze nainstalovat všechny dostupné aktualizace" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Verze %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Stahuji seznam změn ..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Stahovaná velikost: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Váš systém je aktuální" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -930,35 +938,35 @@ msgstr[0] "Můžete instalovat %s aktualizaci" msgstr[1] "Můžete instalovat %s aktualizace" msgstr[2] "Můžete instalovat %s aktualizací" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Prosím čekejte, může to nějakou dobu trvat." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Aktualizace je dokončena" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nová verze: %s (Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Verze %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Vaše distribude už není podporovaná" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -968,17 +976,17 @@ msgstr "" "Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na " "vyšší verzi se podívejte na http://www.ubuntu.com." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1335,200 +1343,217 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Aktualizace" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Udržováno komunitou (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Nesvobodný (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Udržováno komunitou (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Udržováno komunitou (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Nesvobodný (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Nesvobodný (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Instaluji aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiálně podporováno" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Oficiálně podporované" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Udržováno komunitou (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Nesvobodný (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Oficiálně podporované" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Omezeno copyrightem" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" diff --git a/po/da.po b/po/da.po index 1d9e6336..a8005f20 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K \n" "Language-Team: Danish \n" @@ -17,110 +17,118 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Dagligt" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Hver 2. dag" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Ugentligt" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Hver 2. uge" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, fuzzy, python-format msgid "Every %s days" msgstr "Hver %s. dag" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Efter 1 uge" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Efter 2 uger" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Efter 1 måned" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Efter %s dag(e)" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Installer Opdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Opdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importér nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Fejl under importering af den valgte fil" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Fejl ved fjernelse af nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Indtast venligst et navn til disken" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Indsæt venligst en disk i drevet:" @@ -829,16 +837,16 @@ msgstr "Henter fil %li af %li med %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Henter fil %li af %li med ukendt hastighed" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -847,134 +855,134 @@ msgstr "" "Fejl ved hentning af ændringslisten. Undersøg venligst din " "internetforbindelse." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Opgrader til seneste version af Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Installer Opdateringer" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Kan ikke installere alle tilgængelige opdateringer" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Henter listen med ændringer..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Overføringsstørelse: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Dit system er opdateret" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Vent venligst, dette kan tage et stykke tid." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Opdatering udført" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Din distribution understøtes ikke længere" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -984,17 +992,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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Software indexet er i stykker" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1363,204 +1371,221 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Opdateringer" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Vedligeholdt af fællesskabet (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Ikke frit programmel (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Ikke frit programmel (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ikke frit programmel (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Installer Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officielt understøttet" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Officielt understøttet" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Ikke frit programmel (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Noget software er ikke længere officielt understøttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 #, fuzzy msgid "Restricted copyright" msgstr "Begrænset copyright" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" diff --git a/po/de.po b/po/de.po index bb01bd71..e679473a 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" @@ -18,115 +18,123 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Täglich" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Alle zwei Tage" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Wöchentlich" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Alle zwei Wochen" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Alle %s Tage" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Nach einer Woche" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Nach zwei Wochen" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Nach einem Monat" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Nach %s Tagen" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Aktualisierungen werden installiert" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Software-Aktualisierungen" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Quellen" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Quellen" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Schlüssel importieren" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -137,11 +145,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Geben Sie einen Namen für das Medium ein" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie ein Medium in das Laufwerk:" @@ -863,20 +871,20 @@ msgstr "Datei %li von %li wird mit %s/s heruntergeladen" msgid "Downloading file %li of %li with unknown speed" msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen " "Sie es zu einem späteren Zeitpunkt erneut." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen " "Sie es zu einem späteren Zeitpunkt erneut." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -884,134 +892,134 @@ msgstr "" "Die Liste mit Änderungen konnte nicht heruntergeladen werden. Bitte " "überprüfen Sie Ihre Internet-Verbindung." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Aus die neueste Version von Ubuntu aktualisieren" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Aktualisierungen werden installiert" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Liste mit Änderungen wird heruntergeladen..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Download-Größe: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Ihr System ist auf dem aktuellen Stand" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Aktualisierung ist abgeschlossen" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Neue Version: %s (Größe: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Ihre Distribution wird nicht länger unterstützt" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1030,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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Neue Version '%s' der Distribution ist freigegeben" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Der Software-Index ist beschädigt" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1400,200 +1408,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Aktualisierungen" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Von der Gemeinschaft betreut (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Contributed Software" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Unfrei (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Unfrei (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Software mit US-Exportbeschränkungen" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Aktualisierungen werden installiert" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Offiziell unterstützt" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Offiziell unterstützt" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Unfrei (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Urheberrechtlich eingeschränkt" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -2036,15 +2062,9 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Contributed Software" - #~ msgid "Non-free software" #~ msgstr "Unfreie Software" -#~ msgid "US export restricted software" -#~ msgstr "Software mit US-Exportbeschränkungen" - #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "" #~ "Automatischer Signaturschlüssel des Ubuntu-Archivs " diff --git a/po/el.po b/po/el.po index 69ee6eb5..2d55ab71 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -16,112 +16,120 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Ημερησίως" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Κάθε δύο ημέρες" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Εβδομαδιαίως" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Κάθε δύο εβδομάδες" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Κάθε %s ημέρες" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Μετά από μια εβδομάδα" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Μετά από δύο εβδομάδες" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Μετά από ένα μήνα" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Μετά από %s ημέρες" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Εγκατάσταση ενημερώσεων" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "Κανάλι λογισμικού" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "Ενεργό" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Εισαγωγή κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να " "είναι κατεστραμμένο." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Σφάλμα απομάκρυνσης του κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως " "σφάλμα." -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -132,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:" @@ -849,18 +857,18 @@ msgstr "Λήψη αρχείου %li από %li με %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -868,134 +876,134 @@ msgstr "" "Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Εγκατάσταση ενημερώσεων" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Έκδοση%s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Λήψη της λίστας των αλλαγών..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Μέγεθος λήψης: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Το σύστημα σας είναι ενημερωμένο" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση" msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Η ενημέρωση ολοκληρώθηκε" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Νέα έκδοση: %s (Μέγεθος: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Έκδοση%s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Η διανομή σας δεν υποστηρίζεται πια" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1006,17 +1014,17 @@ msgstr "" "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες " "για την αναβάθμιση." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Είναι διαθέσιμη νέα έκδοση διανομής '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1378,200 +1386,217 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Αναβαθμίσεις Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Community maintained (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Όχι-ελεύθερα (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Όχι-ελεύθερα (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Εγκατάσταση ενημερώσεων" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Με επίσημη υποστήριξη" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Oficially supported" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Περιορισμένα πνευματικά δικαιώματα" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" diff --git a/po/en_AU.po b/po/en_AU.po index 2bcde566..9d153fcb 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-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons \n" "Language-Team: English (Australia) \n" @@ -17,110 +17,118 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Daily" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Every two days" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Weekly" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Every two weeks" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Every %s days" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "After one week" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "After two weeks" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "After one month" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "After %s days" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Install Updates" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Import key" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Please enter a name for the disc" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Please insert a disc in the drive:" @@ -840,16 +848,16 @@ msgstr "Downloading file %li of %li with %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Downloading file %li of %li with unknown speed" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "The list of changes is not available yet. Please try again later." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "The list of changes is not available yet. Please try again later." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -857,134 +865,134 @@ msgstr "" "Failed to download the list of changes. Please check your Internet " "connection." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Upgrade to the latest version of Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Install Updates" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Cannot install all available updates" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Downloading the list of changes..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Download size: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Your system is up-to-date" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "New version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Your distribution is not supported anymore" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -994,17 +1002,17 @@ msgstr "" "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "New distribution release '%s' is available" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1369,201 +1377,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Community maintained (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Non-free (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Install Updates" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Some software no longer officially supported" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" diff --git a/po/en_CA.po b/po/en_CA.po index f71ff780..decd0e07 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-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -17,113 +17,121 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "Details" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Install" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -777,16 +785,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "There is a new release of Ubuntu available!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -795,153 +803,153 @@ msgstr "" "Failed to download changes. Please check if there is an active internet " "connection." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.04 Security Updates" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Install" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Cancel downloading the ChangeLog" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1284,206 +1292,224 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.04 Updates" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Community maintained (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Contributed software" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "US export restricted software" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Install" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Officially supported" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.04 Updates" @@ -1824,15 +1850,9 @@ msgstr "" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Contributed software" - #~ msgid "Non-free software" #~ msgstr "Non-free software" -#~ msgid "US export restricted software" -#~ msgstr "US export restricted software" - #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "Ubuntu Archive Automatic Signing Key " diff --git a/po/en_GB.po b/po/en_GB.po index 370e696e..d0bab3cc 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-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" @@ -16,113 +16,121 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "Details" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Installing updates..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Software Updates" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -130,11 +138,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -776,16 +784,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "There is a new release of Ubuntu available!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -794,153 +802,153 @@ msgstr "" "Failed to download changes. Please check if there is an active internet " "connection." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Installing updates..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Downloading Changes" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1284,205 +1292,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Community maintained (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Contributed software" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "US export restricted software" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Installing updates..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Officially supported" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Updates" @@ -1769,15 +1795,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Binary" -#~ msgid "Contributed software" -#~ msgstr "Contributed software" - #~ msgid "Non-free software" #~ msgstr "Non-free software" -#~ msgid "US export restricted software" -#~ msgstr "US export restricted software" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 \"Woody\"" diff --git a/po/es.po b/po/es.po index 5af5554c..46295b1c 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López \n" "Language-Team: Spanish \n" @@ -19,115 +19,123 @@ msgstr "" "X-Generator: KBabel 1.10\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Una vez al día" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Cada dos días" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Una vez a la semana" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Cada dos semanas" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Cada %s días" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Después de una semana" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Después de dos semanas" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Después de un mes" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Después de %s días" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Instalando actualizaciones" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Actualizaciones de software" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Fuente" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Fuente" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importar clave" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Hubo un error al importar el archivo seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -138,11 +146,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Por favor, introduzca un nombre para el disco" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Por favor, inserte un disco en la unidad:" @@ -860,20 +868,20 @@ msgstr "Descargando archivo %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Descargando archivo %li de %li a velocidad desconocida" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo " "más tarde." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo " "más tarde." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -881,134 +889,134 @@ msgstr "" "Hubo un fallo al descargar la lista de cambios. Por favor, compruebe su " "conexión a Internet." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Actualizar a la última versión de Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Instalando actualizaciones" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "No se han podido instalar todas las actualizaciones disponibles" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Descargando la lista de cambios..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Tamaño de descarga: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Su sistema está actualizado" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Por favor, espere; esto puede tardar un poco." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "La actualización se ha completado" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nueva versión: %s (Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Su distribución ya no está soportada" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -1018,17 +1026,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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Está disponible la nueva versión «%s» de la distribución" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "El índice de software está dañado" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1394,200 +1402,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualizaciones de Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Mantenido por la comunidad (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Software contribuido" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 «Dapper Drake»" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantenido por la comunidad (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Mantenido por la comunidad (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Software no libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Software no libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Software con restricciones de exportación estadounidenses" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 «Dapper Drake»" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Instalando actualizaciones" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Soportado oficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Actualizaciones de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "«Backports» de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Soportado oficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Actualizaciones de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "«Backports» de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 «Breezy Badger»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Mantenido por la comunidad (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Software no libre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Algunos programas ya no están soportados oficialmente" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Copyright restringido" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Actualizaciones de seguridad" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Actualizaciones de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "«Backports» de Ubuntu 5.10" @@ -1975,15 +2001,9 @@ msgstr "Software no compatible con la DFSG" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Software contribuido" - #~ msgid "Non-free software" #~ msgstr "Software no libre" -#~ msgid "US export restricted software" -#~ msgstr "Software con restricciones de exportación estadounidenses" - #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "" #~ "Clave de firmado automático del archivo de Ubuntu " diff --git a/po/fi.po b/po/fi.po index 2c1b01ac..959956f5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -16,113 +16,121 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Päivittäin" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Joka toinen päivä" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Viikottain" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Joka toinen viikko" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "%s päivän välein" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Viikon jälkeen" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Kahden viikon jälkeen" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Kuukauden jälkeen" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s päivän jälkeen" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Asennetaan päivityksiä" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "Ohjelmistokanava" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "Aktiivinen" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Lähdekoodi" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Lähdekoodi" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Tuo avain" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -133,11 +141,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Syötä nimi levylle" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Aseta levy asemaan:" @@ -845,151 +853,151 @@ msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Päivitä Ubuntun viimeisimpään versioon" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Asennetaan päivityksiä" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versio: %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Noudetaan muutosluetteloa..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 #, fuzzy msgid "None" msgstr "Ei-vapaa" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "%s täytyy noutaa" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Järjestelmäsi on ajan tasalla" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Odota, tämä voi kestää jonkun aikaa." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Päivitys on valmis" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Uusi versio: %s (koko: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versio: %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Jakeluasi ei enää tueta" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -999,17 +1007,17 @@ msgstr "" "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja " "päivittämisestä osoitteesta http://www.ubuntu.com/" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Uusi jakelujulkaisu \"%s\" on saatavilla" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Ohjelmaluettelo on rikkinäinen" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1371,200 +1379,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 päivitykset" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Yhteisön ylläpitämät (universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Muiden tarjoamat ohjelmat" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Yhteisön ylläpitämät (universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Ei-vapaat ohjelmat (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "USA:sta vientirajoitetut ohjelmat" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Asennetaan päivityksiä" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Virallisesti tuettu" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Virallisesti tuettu" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Rajoitettu tekijänoikeus" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" @@ -1917,15 +1943,9 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Muiden tarjoamat ohjelmat" - #~ msgid "Non-free software" #~ msgstr "Ei-vapaat ohjelmat" -#~ msgid "US export restricted software" -#~ msgstr "USA:sta vientirajoitetut ohjelmat" - #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "" #~ "Ubuntu-arkiston automaattinen allekirjoitusavain " diff --git a/po/fr.po b/po/fr.po index 18e5ac8a..6847a205 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" @@ -17,115 +17,123 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Quotidiennement" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Tous les deux jours" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Hebdomadaire" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Toutes les deux semaines" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Tous les %s jours" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Après une semaine" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Après deux semaines" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Après un mois" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Après %s jours" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Installation des mises à jour" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Mises à jour des logiciels" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importer la clé" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Erreur lors de l'importation du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -136,11 +144,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Veuillez saisir un nom pour le disque" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Veuillez insérer un disque dans le lecteur :" @@ -859,20 +867,20 @@ msgstr "Téléchargement du fichier %li sur %li à %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "La liste des modifications n'est pas encore disponible. Veuillez réessayer " "plus tard." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "La liste des modifications n'est pas encore disponible. Veuillez réessayer " "plus tard." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -880,134 +888,134 @@ msgstr "" "Échec du téléchargement de la liste des modifications. Veuillez vérifier que " "votre connexion Internet est activée." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Installation des mises à jour" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Impossible d'installer toutes les mises à jour disponibles" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Téléchargement de la liste des nouveautés…" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Taille du téléchargement : %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Votre système est à jour" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Veuillez patienter, cela peut prendre du temps." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "La mise à jour est terminée" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nouvelle version : %s (taille : %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Votre distribution n'est plus supportée" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1025,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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Une nouvelle version « %s » est disponible" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "La liste des logiciels est corrompue" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1397,200 +1405,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Mises à jour pour Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Maintenu par la communauté (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Logiciel contribué" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu Dapper Drake 6.06" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Maintenu par la communauté (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Maintenu par la communauté (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Non-libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Logiciel restreint à l'export (USA)" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu Dapper Drake 6.06" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Installation des mises à jour" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu Breezy Badger 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Supportés officiellement" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu Breezy Badger 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "« Backports » pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Mises à jour de sécurité" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Mises à jour de sécurité" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Supporté officiellement" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "« Backports » pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu Breezy Badger 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Maintenu par la communauté (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Non-libre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Certains logiciels ne sont plus supportés officiellement" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Copyright restreint" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Mises à jour de sécurité" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "« Backports » pour Ubuntu 5.10" @@ -1979,15 +2005,9 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Logiciel contribué" - #~ msgid "Non-free software" #~ msgstr "Logiciel non-libre" -#~ msgid "US export restricted software" -#~ msgstr "Logiciel restreint à l'export (USA)" - #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "" #~ "Clé de signature automatique de l'archive Ubuntu " diff --git a/po/fur.po b/po/fur.po index 2cc80acf..32880a22 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz \n" "Language-Team: Friulian \n" @@ -17,108 +17,116 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Ogni dì" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Ogni dòi dîs" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Ogni setemàne" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Ogni dôs setemànis" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Ogni %s dîs" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Dòpo une setemàne" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Dòpo dôs setemànis" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Dopo un mèis" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Dopo %s dîs" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Impuarte la clâf" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -756,162 +764,162 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1229,183 +1237,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/gl.po b/po/gl.po index e55428b7..5d4b8dc1 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -17,116 +17,124 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "Detalles" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Instalando actualizacións..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Actualizacións de software" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Fonte" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Fonte" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Erro importando o ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Erro ao quitar a clave" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -134,11 +142,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -781,16 +789,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Hai unha versión nova de Ubuntu dispoñible!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -799,154 +807,154 @@ msgstr "" "Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión " "activa." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Actualizacións de seguranza de Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 #, fuzzy msgid "Cannot install all available updates" msgstr "Comprobando se hai actualizacións..." -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Descargando cambios" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "A súa distribución xa non está soportada" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1289,205 +1297,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualizacións de Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Mantido pola comunidade (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Software contribuido" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizacións de Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantido pola comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Mantido pola comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Non libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Software con restriccións de exportación estadounidense" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizacións de Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Instalando actualizacións..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Soporte oficial" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Soporte oficial" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Mantido pola comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Non libre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Soporte oficial" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Dereito de copia restrinxido" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Actualizacións de Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualizacións de Ubuntu 5.10" @@ -1733,15 +1759,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Binario" -#~ msgid "Contributed software" -#~ msgstr "Software contribuido" - #~ msgid "Non-free software" #~ msgstr "Software non libre" -#~ msgid "US export restricted software" -#~ msgstr "Software con restriccións de exportación estadounidense" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 \"Woody\"" diff --git a/po/he.po b/po/he.po index 106ac280..02fe3885 100644 --- a/po/he.po +++ b/po/he.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: Hebrew \n" @@ -20,112 +20,120 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "מידי יום" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "כל יומיים" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "כל שבוע" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "כל שבועים" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "כל %s ימים" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "אחרי שבוע" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "אחרי שבועים" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "אחרי חודש" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "אחרי %s ימים" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "מתקין עדכונים..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "עדכוני תוכנה" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "מקור" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "מקור" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "שגיאה בייבוא קובץ נבחר" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -136,11 +144,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "אנא הכניסו תקליטור לכונן:" @@ -781,171 +789,171 @@ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" msgid "Downloading file %li of %li with unknown speed" msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "גרסה חדשה של אובונטו זמינה!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "עדכוני אבטחה - אובונטו 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "משדרג את אובונטו" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "לא ניתן להתקין את כל העדכונים הזמינים" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "גרסה %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "מוריד שינוייים" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "המערכת שלך מעודכנת!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "מתקין עדכונים..." msgstr[1] "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 #, fuzzy msgid "Update is complete" msgstr "ההורדה הושלמה" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "גרסה %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "ההפצה שלך כבר לא נתמכת, סליחה." -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1288,205 +1296,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "עדכונים - אובונטו 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "מתוחזק ע\"י קהילה (Universe(" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "תוכנה שנתרמה" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "לא-חופשי (Multiverse(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "לא-חופשי (Multiverse(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "תוכנה מוגבלת בארה\"ב" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "מתקין עדכונים..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "נתמך רשמית" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "נתמך רשמית" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "לא-חופשי (Multiverse(" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "נתמך רשמית" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "זכויות יוצרים מגבילות" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "עדכונים - אובונטו 5.10" @@ -1749,15 +1775,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "בינארי" -#~ msgid "Contributed software" -#~ msgstr "תוכנה שנתרמה" - #~ msgid "Non-free software" #~ msgstr "תוכנה לא-חופשית" -#~ msgid "US export restricted software" -#~ msgstr "תוכנה מוגבלת בארה\"ב" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "דביאן 3.0 \"וודי\"" diff --git a/po/hi.po b/po/hi.po index 6a509cb7..0a14e9f3 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Hindi \n" @@ -17,108 +17,116 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -756,162 +764,162 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1229,183 +1237,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/hr.po b/po/hr.po index 52847e7a..255a4694 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" @@ -18,110 +18,118 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Dnevno" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Svaki drugi dan" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Tjedno" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Svaki drugi tjedan" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Svakih %s dana" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Nakon tjedan dana" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Nakon dva tjedna" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Nakon mjesec dana" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Nakon %s dana" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Instaliraj nadogradnje" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Nadogradnje programa" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Unos ključa" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Greška prilikom uvoženja odabrane datoteke" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Greška prilikom brisanja ključa" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -132,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Upišite ime za disk" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Ubacite CD u uređaj:" @@ -847,18 +855,18 @@ msgstr "Preuzimam datoteku %li od %li pri %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -866,99 +874,99 @@ msgstr "" "Preuzimanje popisa promjena nije uspjelo. Molim, provjerite svoju internet " "vezu." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Nadogradi na zadnju verziju Ubuntua" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Instaliraj nadogradnje" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Ne mogu instalirati sve dostupne nadogradnje" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Verzija %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Preuzimam popis promjena..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Veličina preuzimanja: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Vaš sustav sadrži posljednje nadogradnje" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -966,35 +974,35 @@ msgstr[0] "Možete instalirati %s nadogradnju" msgstr[1] "Možete instalirati %s nadogradnje" msgstr[2] "Možete instalirati %s nadogradnji" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nova verzija: %s (Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Verzija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Vaša distibucija više nije podržana" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1012,17 @@ msgstr "" "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više " "detalja o nadogradnji." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Popis programa je oštećen" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1373,201 +1381,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 osvježenja" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Održavani od strane zajednice (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Neslobodni (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Održavani od strane zajednice (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Održavani od strane zajednice (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Neslobodni (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neslobodni (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Instaliraj nadogradnje" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Službeno podržani" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 osvježenja" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 backporti" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Službeno podržani" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 osvježenja" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 backporti" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Održavani od strane zajednice (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Neslobodni (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Neki paketi više nisu službeno podržani" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Ograničeno autorsko pravo" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 osvježenja" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 backporti" diff --git a/po/hu.po b/po/hu.po index b6efe310..4e4bda92 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -17,110 +17,118 @@ msgstr "" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Naponta" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Kétnaponta" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Hetente" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Minden két hétben" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "%s naponta" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Egy hét után" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Két hét után" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Egy hónap után" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s nap után" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Telepítés" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Szoftverfrissítések" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Kulcs importálása" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Kérem, adja meg a lemez nevét" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:" @@ -845,16 +853,16 @@ msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp" msgid "Downloading file %li of %li with unknown speed" msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "A módosítások listája még nem érhető el. Próbálkozzon később." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "A módosítások listája még nem érhető el. Próbálkozzon később." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -862,133 +870,133 @@ msgstr "" "A módosítások listájának letöltése meghiúsult. Ellenőrizze az " "internetkapcsolatát." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 biztonsági frissítések" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Frissítés az Ubuntu legújabb változatára" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Telepítés" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Nem telepíthető minden rendelkezésre álló frissítés" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "%s verzió: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Módosítások listájának letöltése..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Letöltés mérete: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "A rendszere naprakész" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Kis türelmet, ez eltarthat egy ideig." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "A frissítés befejeződött" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Új verzió: %s (Méret: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "%s verzió: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "A terjesztés már nem támogatott" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1006,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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "A disztribúció új \"%s\" kiadása elérhető" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "A szoftverindex sérült" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1370,201 +1378,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 frissítések" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Közösségi karbantartású (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Nem-szabad (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Közösségi karbantartású (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Közösségi karbantartású (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Nem-szabad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Nem-szabad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Telepítés" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Hivatalosan támogatott" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Hivatalosan támogatott" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Közösségi karbantartású (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Nem-szabad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Néhány szoftver már nincs hivatalosan támogatva" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Szerzői jogi korlátozás alatt" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" diff --git a/po/id.po b/po/id.po index 5714019a..82b44e53 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" @@ -16,111 +16,119 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Harian" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Setiap dua hari" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Mingguan" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Setiap dua minggu" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Setiap %s hari" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Setelah satu minggu" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Setelah dua minggu" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Setelah satu bulan" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Setelah %s hari" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Instal Update" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Perangkat Lunak Mutakhir" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Impor kunci" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Kesalahan mengimpor berkas terpilih" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Kesalahan menghapus kunci" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Silakan masukkan nama untuk cakram" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Silakan masukan cakram ke dalam penggerak" @@ -840,16 +848,16 @@ msgstr "Mengunduh berkas %li dari %li dengan %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -857,133 +865,133 @@ msgstr "" "Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet " "anda." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Pemutakhiran lewat Internet" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Upgrade ke versi Ubuntu terakhir" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Instal Update" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versi %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Mengunduh senarai dari perubahan..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Ukuran unduh: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Sistem anda telah up-to-date" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Pemutakhiran selesai" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versi baru: %s (Ukuran: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versi %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Distribusi anda tidak disokong lagi" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -993,17 +1001,17 @@ msgstr "" "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www." "ubuntu.com untuk informasi lebih lanjut." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Luncuran distribusi baru '%s' telah tersedia" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Indeks perangkat lunak telah rusak" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1364,199 +1372,216 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Dikelola oleh komunitas (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Tidak-bebas (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Tidak-bebas (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Tidak-bebas (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Pemutakhiran lewat Internet" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Instal Update" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Resmi disokong" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 6.06 LTS Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Resmi disokong" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 6.06 LTS Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Tidak-bebas (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Hak cipta terlarang" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 6.06 LTS Backports" diff --git a/po/it.po b/po/it.po index a9c5d7df..b38a79e6 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -18,115 +18,123 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Ogni giorno" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Ogni due giorni" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Ogni settimana" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Ogni due settimane" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Ogni %s giorni" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Dopo una settimana" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Dopo due settimane" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Dopo un mese" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Dopo %s giorni" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Installazione degli aggiornamenti" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Aggiornamenti Software" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Sorgente" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Sorgente" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importa chiave" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Errore nell'importare il file selezionato" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Errore nel rimuovere la chiave" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -137,11 +145,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Inserire un nome per il disco" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Inserire un disco nell'unità:" @@ -857,18 +865,18 @@ msgstr "Scaricamento del file %li di %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Scaricamento del file %li di %li a velocità sconosciuta" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -876,134 +884,134 @@ msgstr "" "Fallito lo scaricamento dell'elenco dei cambiamenti. Verificare la " "connessione ad Internet." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Aggiorna all'ultima versione di Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Installazione degli aggiornamenti" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Impossibile installare tutti gli aggiornamenti disponibili" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versione %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Scaricamento dell'elenco dei cambiamenti..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Dati da scaricare: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Il sistema è aggiornato!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Attendere, l'operazione potrebbere richiedere del tempo." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Aggiornamento completato" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nuova versione: %s (Dimensione: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versione %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "La distribuzione in uso non è più supportata" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1021,17 @@ msgstr "" "versione più aggiornata di Ubuntu Linux. Per maggiori informazioni " "consultare http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "L'indice dei programmi è rovinato" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1389,201 +1397,219 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Aggiornamenti di Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Mantenuto dalla comunità (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Software contribuito" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantenuto dalla comunità (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Mantenuto dalla comunità (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Non libero (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non libero (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Software non esportabile dagli USA" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Installazione degli aggiornamenti" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Supportato ufficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Aggiornamenti di Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Backport di Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Supportato ufficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Aggiornamenti di Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Backport di Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Mantenuto dalla comunità (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Non libero (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Software non più supportato ufficialmente" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Copyright con restrizioni" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Aggiornamenti di Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Backport di Ubuntu 5.10" @@ -1951,15 +1977,9 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "Binary" #~ msgstr "Binario" -#~ msgid "Contributed software" -#~ msgstr "Software contribuito" - #~ msgid "Non-free software" #~ msgstr "Software non libero" -#~ msgid "US export restricted software" -#~ msgstr "Software non esportabile dagli USA" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian·3.0·\"Woody\"" diff --git a/po/ja.po b/po/ja.po index 67e4b650..56e3fa45 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu Japanese Team \n" @@ -18,112 +18,120 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "X 日ごとに" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "2日ごと" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "X 週ごとに" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "2週ごと" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "%s 日ごと" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "1週間後" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "2週間後" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "1ヶ月後" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s 日後" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "アップデートをインストール中" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "ソフトウェアのアップデート" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "ソース" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "ソース" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "鍵のインポート" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "選択したファイルのインポートエラー" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "選択したファイルはGPG鍵ファイルではないか、壊れている可能性があります。" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "鍵削除のエラー" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択した鍵を削除できませんでした。バグとして報告してください。" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -134,11 +142,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "ディスク名を入力してください" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "ディスクをドライブに挿入してください:" @@ -834,16 +842,16 @@ msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" msgid "Downloading file %li of %li with unknown speed" msgstr "ダウンロード中: 速度不明で %li のうち %li" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "変更点がまだ取得できません。あとで試してください。" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "変更点がまだ取得できません。あとで試してください。" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -851,133 +859,133 @@ msgstr "" "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ" "い。" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 セキュリティアップデート" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Ubuntu の最新バージョンにアップグレード" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "アップデートをインストール中" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "すべてのアップデートをインストールすることができません" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "バージョン %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "変更点を取得中..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "ダウンロードサイズ: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "システムは最新の状態です!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 個のアップデートがインストールされます" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "しばらくお待ちください。少々時間がかかります。" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "アップデートが完了しました" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新しいバージョン: %s (サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "バージョン %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "このディストリビューションはすでにサポート対象外です" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -987,17 +995,17 @@ msgstr "" "Ubuntu Linux にアップグレードしてください。\r\n" "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "ソフトウェアのインデックスが壊れています" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1358,200 +1366,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 アップデート" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "コミュニティによるメンテナンス (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "寄贈ソフトウェア" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "非フリー (Multiuniverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非フリー (Multiuniverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "アップデートをインストール中" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu·5.10·'Breezy·Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "公式サポート" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu·5.10·'Breezy·Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 バックポート" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "公式サポート" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 バックポート" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu·5.10·'Breezy·Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "非フリー (Multiuniverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "いくつかのソフトウェアはもう公式にサポートされません" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "限定的な著作権(Restricted)" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 バックポート" @@ -1955,15 +1981,9 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "寄贈ソフトウェア" - #~ msgid "Non-free software" #~ msgstr "非フリーソフトウェア" -#~ msgid "US export restricted software" -#~ msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア" - #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "Ubuntu Archive Automatic Signing Key " diff --git a/po/ka.po b/po/ka.po index d80fcac3..b5602a0e 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian \n" @@ -19,112 +19,120 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: KBabel 1.11.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "ყოველ დღიურად" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "ყოველ 2 დღეში" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "კვირეული" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "ყოველ 2 კვირაში" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "ყოველ %s დღეში" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "ერთ კვირაში" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "ორი კვირის შემდგომ" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "ერთი თვის შემდგომ" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s დღის შემდეგ" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "განახლებების _დაყენება" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "პროგრამული განახლებები" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "გასაღების იმპორტი" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "ამორჩეული ფაილის იმპორტი ვერ მოხერხდა" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "ამორჩეული ფაილი შეიძლება არ იყოს GPG გასაღების ფაილი ან შეიძლება იყოს " "დაზიანებული." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "გასღების წაშლა ვერ მოხერხდა" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი." -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -135,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "შეიყვანეთ დისკის სახელი" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "მოათავსეთ დისკი დისკწამყვანში:" @@ -819,152 +827,152 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "ვერ განხორციელდა -სკენ სია ის ინტერნეტი." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "განახლება -სკენ ვერსია ის" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "განახლებების _დაყენება" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "ვერსია %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "მიმდინარეობს ჩამოქაჩვა სია ის." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "ჩამოსატვირთის ზომა: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "თქვენი სისტემა განახლებულია" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "განახლება გასრულებულია" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "ახალი ვერსია: %s (ზომა: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "ვერსია %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 #, fuzzy msgid "" "You will not get any further security fixes or critical updates. Upgrade to " @@ -974,17 +982,17 @@ msgstr "" "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი " "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "პროგრამების სიის ინდექსი დაზიანებულია" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 #, fuzzy msgid "" "It is impossible to install or remove any software. Please use the package " @@ -1346,200 +1354,215 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/ s s s s s" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 განახლებები" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "არათავისუფალი (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "არათავისუფალი (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "არათავისუფალი (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "განახლებების _დაყენება" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "არათავისუფალი (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "არა" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 #, fuzzy msgid "Restricted copyright" msgstr "შეზღუდული" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" diff --git a/po/ko.po b/po/ko.po index 539fe6e8..f2212584 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl \n" "Language-Team: Korean \n" @@ -17,109 +17,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "매일" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "이틀 마다" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "매주" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "두 주 마다" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "%s 일 마다" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "한 주 후에" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "두 주 후에" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "한 달 후에" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s 일 후에" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "업데이트를 설치(_I)" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "소프트웨어 업데이트" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "키 가져오기" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "선택한 파일 가져오기 오류" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못된 것입니다." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "키 삭제 오류" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오." -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -130,11 +138,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "디스크에 사용할 이름을 입력하십시오." -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "드라이브에 디스크를 넣으십시오:" @@ -830,149 +838,149 @@ msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "바뀐 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "우분투 5.10 보안 업데이트" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "우분투 최신 버젼으로 업그레이드 합니다." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "업데이트를 설치(_I)" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "설치할 수 없는 업데이트가 있습니다" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "버전 %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "바뀐 목록을 다운로드 하는 중..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "다운로드 크기: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "시스템이 최신의 상태입니다." -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다." -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "업데이트가 끝났습니다." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "새 버전: %s (크기: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "버전 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "더 이상 지원되지 않는 배포판입니다." -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -982,17 +990,17 @@ msgstr "" "그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에" "서 보실 수 있습니다." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "새 배포판 '%s'를 이용할 수 있습니다" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "소프트웨어 목록이 망가졌습니다." -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1345,201 +1353,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "우분투 5.10 업데이트" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "커뮤니티에서 관리유지함 (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "자유소프트웨어 아님 (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "자유소프트웨어 아님 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "자유소프트웨어 아님 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "업데이트를 설치(_I)" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "공식적으로 지원됨" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "우분투 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "우분투 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "공식적으로 지원됨" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "우분투 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "우분투 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "자유소프트웨어 아님 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "저작권 제한됨" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "우분투 5.10 Backports" diff --git a/po/ku.po b/po/ku.po index 32eb3214..2029bd01 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -17,108 +17,116 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Rojane" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Her du roj" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Heftane" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Her du hefte" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Her %s roj" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Piştî hefteyekê" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Piştî du hefte" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Piştî mehekê" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Piştî %s roj" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -757,163 +765,163 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Ubuntu tê bilindkirin" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Guhertoya %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Mezinahiya daxistinê: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Sîstema te rojane ye" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Rojanekirin temam bû" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Guhertoya nû: %s (Mezinahî: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Guhertoya %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1235,194 +1243,209 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Neazad (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Neazad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neazad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Bi piştgirtiya fermî" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Bi piştgirtiya fermî" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Neazad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Bi piştgirtiya fermî" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/lt.po b/po/lt.po index f4691734..47688c99 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" @@ -17,110 +17,118 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" "100<10 || n%100>=20) ? 1 : 2);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Kasdien" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Kas dvi dienas" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Kas savaitę" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Kas dvi savaites" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Kas %s dienas" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Po savaitės" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Po dviejų savaičių" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Po mėnesio" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Po %s dienų" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Diegiami atnaujinimai" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Programinės įrangos atnaujinimai" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importuoti raktą" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Importuojant pasirinktą failą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Įveskite disko pavadinimą" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Įdėkite diską į įrenginį:" @@ -836,114 +844,114 @@ msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" msgid "Downloading file %li of %li with unknown speed" msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 saugumo atnaujinimai" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Atnaujinti iki naujausios Ubuntu versijos" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Diegiami atnaujinimai" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Negalima įdiegti visų galimų atnaujinimų" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Atsiunčiamas pakeitimų sąrašas..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Atsiuntimo dydis: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Jūsų sistema atnaujinta" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -951,35 +959,35 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Palaukite, tai gali užtrukti." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Atnaujinimas užbaigtas" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nauja versija: %s (Dydis: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Jūsų distribucija daugiau nebepalaikoma" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -989,17 +997,17 @@ msgstr "" "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie " "atnaujinimą rasite http://www.ubuntu.com ." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Programinės įrangos turinys sugadintas" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1364,200 +1372,217 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 atnaujinimai" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Prižiūrima bendruomenės (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Ne Laisva (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 „Dapper Drake“" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Ne Laisva (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ne Laisva (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 „Dapper Drake“" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Diegiami atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficialiai palaikoma" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Prižiūrima oficialiai" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Ne Laisva (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Apribotos autorinės teisės" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" diff --git a/po/mk.po b/po/mk.po index 41a8e55c..45c9194a 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -17,115 +17,123 @@ msgstr "" "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "Детали" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Инсталирам надградби..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Надградба на софтвер" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Изворен код" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Изворен код" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Грешка при увоз на избраната датотека" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Избраната датотека може да не е GPG датотека или пак може да е расипана." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -133,11 +141,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -784,16 +792,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Достапна е нова верзија на Убунту!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -802,101 +810,101 @@ msgstr "" "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет " "врска е активна." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Безбедносни надградби за Debian Stable" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 #, fuzzy msgid "Cannot install all available updates" msgstr "Проверувам за надградби..." -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Верзија %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, fuzzy, python-format msgid "Download size: %s" msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "Вашиот систем е надграден!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -904,53 +912,53 @@ msgstr[0] "Инсталирам надградби..." msgstr[1] "Инсталирам надградби..." msgstr[2] "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Верзија %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуција повеќе не е поддржана" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1294,202 +1302,220 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Надградби за Убунту 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Оддржувано од заедницата (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Додатен софтвер" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Оддржувано од заедницата (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Неслободно (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Неслободно (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Забранет софтвер во САД" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Безбедносни надградби за Debian Stable" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Инсталирам надградби..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официјално поддржано" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Безбедносни надградби за Убунту 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Официјално поддржано" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "Безбедносни надградби за Убунту 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "Надградби за Убунту 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Неслободно (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Официјално поддржано" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Безбедносни надградби за Убунту 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Надградби за Убунту 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Надградби за Убунту 5.10" @@ -1767,15 +1793,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Бинарни" -#~ msgid "Contributed software" -#~ msgstr "Додатен софтвер" - #~ msgid "Non-free software" #~ msgstr "Неслободен софтвер" -#~ msgid "US export restricted software" -#~ msgstr "Забранет софтвер во САД" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 \"Woody\"" diff --git a/po/ms.po b/po/ms.po index c11414eb..c48e70bd 100644 --- a/po/ms.po +++ b/po/ms.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux \n" "Language-Team: Malay \n" @@ -17,111 +17,119 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Harian" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Setiap dua hari" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Mingguan" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Setiap dua minggu" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Setiap %s hari" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Selepas satu minggu" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Selepas dua minggu" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Selepas satu bulan" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Selepas %s hari" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Kekunci impot" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Ralat semasa mengimpot fail yang dipilih" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Ralat semasa mengeluarkan kekunci" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -132,11 +140,11 @@ msgstr "" "↵\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Sila masukkan nama untuk cakera padat" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Sila masukkan cakera padat kedalam pemacu" @@ -796,162 +804,162 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1269,184 +1277,198 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/nb.po b/po/nb.po index fc7aedb4..9e675e7d 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" @@ -17,112 +17,120 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Daglig" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Annenhver dag" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Ukentlig" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Hver andre uke" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Hver %s dag" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Etter en uke" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Etter to uker" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Etter en måned" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Etter %s dager" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Installerer oppdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Programvareoppdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importer nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Feil under importering av valgt fil" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Kunne ikke fjerne nøkkelen" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -133,11 +141,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Vennligst oppgi et navn for platen" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Vennligst sett inn en plate i CD-spilleren:" @@ -848,16 +856,16 @@ msgstr "Laster ned filen %li av %li med %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Laster ned fil %li av %li ved ukjent hastighet" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -865,134 +873,134 @@ msgstr "" "Kunne ikke laste ned listen med endringer. Vennligst kontrollér " "internettilkoblingen." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Oppgrader til siste versjon av Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Installerer oppdateringer" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Kan ikke installere alle tilgjengelige oppdateringer." -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Laster ned listen med endringer..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Nedlastingsstørrelse: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Systemet ditt er oppdatert!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Vennligst vent, dette kan ta litt tid." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Oppdateringen er fullført" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny versjon: %s (Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -1002,17 +1010,17 @@ msgstr "" "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www." "ubuntu.com for mer informasjon om oppgradering." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Ny versjon \"%s\" er tilgjengelig" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Programvareoversikten er ødelagt." -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1374,201 +1382,219 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Oppdateringer" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Vedlikeholdt av miljøet (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Bidratt programvare" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "US eksport begrenset programvare" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Installerer oppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Offisielt støttet" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Offisielt støttet" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Noe programvare er ikke lenger offisielt støttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1879,15 +1905,9 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "Binary" #~ msgstr "Binær" -#~ msgid "Contributed software" -#~ msgstr "Bidratt programvare" - #~ msgid "Non-free software" #~ msgstr "Non-free programvare" -#~ msgid "US export restricted software" -#~ msgstr "US eksport begrenset programvare" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 «Woody»" diff --git a/po/ne.po b/po/ne.po index c521494d..e20b5a99 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -18,112 +18,120 @@ msgstr "" "X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=2;plural=(n!=0)\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "विवरणहरु" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "सफ्टवेयर अद्यावधिकहरु" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "स्रोत" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "स्रोत" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -773,169 +781,169 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "संस्करण %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, fuzzy, python-format msgid "Download size: %s" msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै" msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "संस्करण %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "तपाईंको वितरण समर्थित छैन" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1279,206 +1287,224 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "योगदान गरिएको सफ्टवेयर" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "नन-फ्री (बहुभर्स)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "युएस निषेधित सफ्टवेयर" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "कार्यालय बाट समर्थित" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "कार्यालय बाट समर्थित" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "कार्यालय बाट समर्थित" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "निषेधित प्रतिलिपि अधिकार" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" @@ -1746,15 +1772,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "बाईनरी" -#~ msgid "Contributed software" -#~ msgstr "योगदान गरिएको सफ्टवेयर" - #~ msgid "Non-free software" #~ msgstr "नन-फ्री सफ्टवेयर" -#~ msgid "US export restricted software" -#~ msgstr "युएस निषेधित सफ्टवेयर" - #, fuzzy #~ msgid "Debian Unstable \"Sid\"" #~ msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" diff --git a/po/nl.po b/po/nl.po index 0039dc95..3979d843 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" @@ -16,113 +16,121 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Dagelijks" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Elke twee dagen" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Wekelijks" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Elke twee weken" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Elke %s dagen" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Na één week" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Na twee weken" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Na één maand" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Na %s dagen" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Up_dates installeren" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Software-updates" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Sleutel importeren" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Fout bij het importeren van het geselecteerde bestand." -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Fout bij het verwijderen van de sleutel" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -133,11 +141,11 @@ msgstr "" "↵\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Geef het cd-schijfje een naam" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Plaats een schijf in de speler:" @@ -853,20 +861,20 @@ msgstr "Downloaden van bestand %li uit %li met %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Downloaden van bestand %li uit %li, snelheid onbekend" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. " "Probeer het later nog eens." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. " "Probeer het later nog eens." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -874,134 +882,134 @@ msgstr "" "Kon de lijst met wijzigingen niet downloaden. Controleer uw " "internetverbinding." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 veiligheidsupdates" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Upgrade naar de nieuwste versie van Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Up_dates installeren" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Kan de beschikbare updates niet installeren" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versie %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Het overzicht van de wijzigingen wordt gedownload..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Downloadgrootte: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Uw systeem is up-to-date" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Een ogenblik geduld, dit kan even duren." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "De update is voltooid" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nieuwe versie: %s (Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versie %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Uw distributie wordt niet langer ondersteund" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1019,17 @@ msgstr "" "upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu." "com voor meer informatie over upgraden." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Software-index is beschadigd" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1382,201 +1390,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 updates" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Door de gemeenschap beheerd (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Niet-vrij (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Niet-vrij (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Niet-vrij (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Up_dates installeren" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officieel ondersteund" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 updates" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Officieel ondersteund" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 updates" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Niet-vrij (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Bepaalde software wordt niet meer officieel ondersteund" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Beperkte auteursrechten" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 updates" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 backports" diff --git a/po/no.po b/po/no.po index ce95de07..dbe32eff 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -17,113 +17,121 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "Detaljer" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Installerer oppdateringer..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Programvareoppdateringer" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Kilde" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -778,169 +786,169 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Det er en ny versjon av Ubuntu tilgjengelig!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, fuzzy, python-format msgid "Download size: %s" msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "Systemet er helt oppdatert!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1283,205 +1291,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Vedlikeholdt av miljøet (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Bidratt programvare" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "US eksport begrenset programvare" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Installerer oppdateringer..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Offisielt støttet" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Offisielt støttet" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Offisielt støttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Updates" @@ -1760,15 +1786,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Binær" -#~ msgid "Contributed software" -#~ msgstr "Bidratt programvare" - #~ msgid "Non-free software" #~ msgstr "Non-free programvare" -#~ msgid "US export restricted software" -#~ msgstr "US eksport begrenset programvare" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 «Woody»" diff --git a/po/oc.po b/po/oc.po index 2a369d2a..c62d7e82 100644 --- a/po/oc.po +++ b/po/oc.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" @@ -18,111 +18,119 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Cada jorn" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Cada dos jorns" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Cada setmana" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Cada dos setmanas" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Cada %s jorns" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Après una setmana" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Après dos setmanas" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Après un mes" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Après %s jorns" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importar clau" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Error al moment d'importar lo fichièr seleccionat" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Error al moment de suprimir la clau" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -133,11 +141,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Picatz un nom pel disc" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Metètz un disc dins lo legidor :" @@ -764,164 +772,164 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Metre a jorn Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Mesas a jorn per internet" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Talha de la descarga : %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1243,197 +1251,212 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Pas liure (multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Pas liure (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Pas liure (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Pas liure (multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/pa.po b/po/pa.po index 396fec53..14d8ece1 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -17,110 +17,118 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.9.1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "ਵੇਰਵਾ" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -128,11 +136,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -763,164 +771,164 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1252,185 +1260,199 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/pl.po b/po/pl.po index a54f3a7a..d82309de 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Polish \n" @@ -17,111 +17,119 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Codziennie" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Co dwa dni" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Co tydzień" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Co dwa tygodnie" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Co %s dni" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Po tygodniu" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Po dwóch tygodniach" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Po miesiącu" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Po %s dniach" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Instalowanie pakietów" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Aktualizacje oprogramowania" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Źródłowy" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Źródłowy" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Zaimportuj klucz" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Błąd podczas importowania wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -132,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Proszę podać nazwę dla płyty" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Proszę włożyć płytę do napędu:" @@ -846,16 +854,16 @@ msgstr "Pobieranie pliku %li z %li z prędkością %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -863,99 +871,99 @@ msgstr "" "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić połączenie z " "Internetem." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Zaktualizuj do najnowszej wersji Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Instalowanie pakietów" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Wersja %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Pobieranie informacji o zmianach..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Rozmiar do pobrania: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Twój system jest w pełni zaktualizowany" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -963,35 +971,35 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s" msgstr[1] "Ilość dostępnych aktualizacji: %s" msgstr[2] "Ilość dostępnych aktualizacji: %s" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Proszę czekać, to może chwilę potrwać." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Aktualizacja została ukończona." -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nowa wersja: %s (Rozmiar: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Wersja %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Twoja dystrybucja nie jest już wspierana" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1009,17 @@ msgstr "" "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. " "Odwiedź http://www.ubuntu.com po więcej informacji." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Spis oprogramowania jest uszkodzony" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1374,200 +1382,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Aktualizacje dla Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Utrzymywane przez społeczność (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Inne oprogramowanie (Contributed)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Nie-wolnodostępne (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Instalowanie pakietów" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Wspierane oficjalnie" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Wspierane oficjalnie" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Niektóre programy nie są już oficjalnie wspierane" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "O ograniczonych prawach kopiowania" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" @@ -1951,15 +1977,9 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Inne oprogramowanie (Contributed)" - #~ msgid "Non-free software" #~ msgstr "Oprogramowanie nie-wolnodostępne" -#~ msgid "US export restricted software" -#~ msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA" - #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "Klucz automatycznego podpisu archiwum Ubuntu " diff --git a/po/pt.po b/po/pt.po index 1ed06dff..9c701587 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho \n" "Language-Team: Ubuntu Portuguese Team \n" @@ -15,112 +15,120 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Diariamente" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "De 2 em 2 dias" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Semanalmente" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "De 2 em 2 semanas" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Todos os %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Após uma semana" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Após duas semanas" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Após um mês" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Depois de %s dias" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "A instalar actualizações" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Actualizações de Software" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importar chave" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Erro ao importar ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Erro ao remover a chave" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -131,11 +139,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Por favor introduza um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" @@ -847,18 +855,18 @@ msgstr "A descarregar ficheiro %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "A lista de alterações ainda não está disponível. Por favor tente mais tarde." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "A lista de alterações ainda não está disponível. Por favor tente mais tarde." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -866,134 +874,134 @@ msgstr "" "Falha a descarregar a lista de alterações. Por favor verifique a sua ligação " "à internet." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Actualizações de Segurança" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Actualize para a última versão do Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "A instalar actualizações" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Impossível de instalar todas as actualizações disponíveis" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versão %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "A descarregar lista de alterações..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Por favor aguarde, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "A actualização está completa" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nova versão: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versão %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "A sua distribuição já não é suportada" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1003,17 +1011,17 @@ msgstr "" "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais " "informação em como actualizar." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "O índice de software está quebrado" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1375,201 +1383,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Actualizações" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Mantido pela comunidade (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Não-livre (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantido pela comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Mantido pela comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "A instalar actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Suportado Oficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Suportado Oficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Mantido pela comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Algum software já não é suportado oficialmente" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Direitos de autor restritos" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5a47815c..57131852 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-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut \n" "Language-Team: Ubuntu-BR \n" @@ -16,115 +16,123 @@ msgstr "" "X-Poedit-Country: BRAZIL\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Diário" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "A cada dois dias" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Semanalmente" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "A cada duas semanas" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "A cada %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Após uma semana" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Após duas semanas" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Após um mês" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Após %s dias" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Instalando Atualizações" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Modificando os canais de programas" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Source" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importar Chave" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Erro importando o arquivo selecionado" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Erro removendo a chave" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -135,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Por favor digite um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" @@ -850,20 +858,20 @@ msgstr "Obtendo arquivo %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "A lista de alterações não está disponível ainda. Por favor, tente novamente " "mais tarde." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "A lista de alterações não está disponível ainda. Por favor, tente novamente " "mais tarde." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -871,134 +879,134 @@ msgstr "" "Não foi possível baixar a lista de mudanças. Por favor, verifique sua " "conexão com a internet." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Atualizações de Segurança do Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Atualizar para a última versão do Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Instalando Atualizações" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Não foi possível instalar todas as atualizações disponíveis" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Obtendo a lista de alterações" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Seu sistema está atualizado" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Por favor, espere, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Atualização completa" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "New version: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Sua distribuição não é mais suportada" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1016,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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "A índex de software está quebrado" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1384,200 +1392,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Atualizações do Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Mantido pela Comunidade (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Contributed software" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantido pela Comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Mantido pela Comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "US export restricted software" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Instalando Atualizações" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Suporte oficial" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Backports do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Suportado Oficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Backports do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Mantido pela Comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Alguns softwares não são mais oficialmente suportado." #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Restrito por copyright" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Backports do Ubuntu 5.10" @@ -2012,15 +2038,9 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Contributed software" - #~ msgid "Non-free software" #~ msgstr "Non-free software" -#~ msgid "US export restricted software" -#~ msgstr "US export restricted software" - #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "Ubuntu Archive Automatic Signing Key " diff --git a/po/ro.po b/po/ro.po index df181e9a..e4231744 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" @@ -17,116 +17,124 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n %\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Zilnic" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "La fiecare două zile" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Săptămânal" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "La fiecare 2 săptămâni" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "La fiecare %s zile" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "După o saptămână" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "După două săptămâni" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "După o lună" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "După %s zile" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_Instalează actualizarile" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Actualizări software" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "" "Binar\n" "Sursă" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "" "Binar\n" "Sursă" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 #, fuzzy msgid "Import key" msgstr "Importă cheie" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Eroare la importarea fişierului selectat" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Eroare la ştergerea cheii." -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -137,11 +145,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Introduceţi un nume pentru disc" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Introduceţi un disc în unitate:" @@ -784,16 +792,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Nu există nici un pachet de actualizat." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -802,100 +810,100 @@ msgstr "" "Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o " "conexiune internet activă." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Actualizări de Securitate Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Se actualizează Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_Instalează actualizarile" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Versiunea %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Se descarcă listă schimbărilor..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Sistemul dumneavoastră este actualizat la zi!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -903,53 +911,53 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versiunea nouă: %s (Mărime: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Versiunea %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Distribuţia dvs. nu mai este suportată" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1295,202 +1303,220 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualizări Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Pachete întreţinute de comunitate (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Software în contribuţie" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Pachete non-libere (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Pachete non-libere (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Software cu restricţii de export din SUA" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Actualizări de Securitate Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_Instalează actualizarile" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Pachete suportate oficial" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizări de securitate Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Pachete suportate oficial" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Pachete non-libere (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Pachete suportate oficial" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Copyright restrictiv" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizări de securitate Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" @@ -1738,15 +1764,9 @@ msgstr "" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Software în contribuţie" - #~ msgid "Non-free software" #~ msgstr "Software non-liber" -#~ msgid "US export restricted software" -#~ msgstr "Software cu restricţii de export din SUA" - #, fuzzy #~ msgid "" #~ "Available Updates\n" diff --git a/po/ru.po b/po/ru.po index aa147236..616a59c8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -18,110 +18,118 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Ежедневно" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Каждые два дня" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Еженедельно" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Каждые две недели" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Каждые %s дней" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Через неделю" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Через две недели" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Через месяц" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Через %s дней" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Установить обновления" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Обновления программ" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Импортировать ключ" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Ошибка при импортировании выбранного файла" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Возможно выбранный файл не является файлом ключа GPG или поврежден." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Ошибка при удалении ключа" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке." -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -132,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Введите название для диска" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Пожалуйста, вставьте диск в привод:" @@ -843,18 +851,18 @@ msgstr "Загрузка файла %li из %li со скоростью %s/с" msgid "Downloading file %li of %li with unknown speed" msgstr "Загрузка файла %li из %li с неизвестной скоростью" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "" "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -862,99 +870,99 @@ msgstr "" "Не удалось загрузить список изменений. Пожалуйста, проверьте соединение с " "интернет." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Обновления безопасности Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Обновить систему до последней версии Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Установить обновления" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Невозможно установить все доступные обновления" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Загрузка списка изменений..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Размер загружаемых данных: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Ваша система не требует обновления" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -962,35 +970,35 @@ msgstr[0] "Вы можете установить %s обновление" msgstr[1] "Вы можете установить %s обновления" msgstr[2] "Вы можете установить %s обновлений" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Пожалуйста подождите, это может занять некоторое время." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Обновление завершено" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Новая версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Ваша версия Ubuntu больше не поддерживается" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -1000,17 +1008,17 @@ msgstr "" "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для " "получения информации об обновлении посетите http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "Доступен новый релиз дистрибутива '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Индекс программ поврежден" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1369,201 +1377,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Обновления Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Поддерживается сообществом (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Несвободное (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Поддерживается сообществом (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Поддерживается сообществом (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Несвободное (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Несвободное (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Обновления безопасности Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Установить обновления" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официально поддерживается" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Обновления безопасности Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Обновления Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Официально поддерживается" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Обновления безопасности Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Обновления Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Поддерживается сообществом (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Несвободное (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Некоторые программы больше не поддерживаются официально" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Ограниченные авторские права" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Обновления безопасности Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Обновления Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" diff --git a/po/rw.po b/po/rw.po index c19cfd45..1eae4fdb 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -24,114 +24,122 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "Error scaning the CD\n" @@ -139,11 +147,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -778,16 +786,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "ni a Gishya Bya Bihari" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -795,152 +803,152 @@ msgid "" msgstr "" "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "5" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Kwinjiza porogaramu" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, fuzzy, python-format msgid "Version %s: \n" msgstr "Verisiyo \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Iyimura... i" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "Sisitemu ni Hejuru Kuri Itariki" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Verisiyo \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ikwirakwiza... ni Oya" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1280,205 +1288,221 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "5" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Kohereza Nta gukoresha bisesuye" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Kigenga" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Kigenga" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Kohereza Nta gukoresha bisesuye" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Kwinjiza porogaramu" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "5" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "5" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 #, fuzzy msgid "Non-free (Multiverse)" msgstr "Kigenga" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 #, fuzzy msgid "Restricted copyright" msgstr "Uburenganzira bw'umuhimbyi" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "5" @@ -1802,10 +1826,6 @@ msgstr "" #~ msgid "Non-free software" #~ msgstr "Kigenga" -#, fuzzy -#~ msgid "US export restricted software" -#~ msgstr "Kohereza Nta gukoresha bisesuye" - #, fuzzy #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "com" diff --git a/po/sk.po b/po/sk.po index bab83ef0..8714b482 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" @@ -17,111 +17,119 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural= (n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Denne" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Každý druhý deň" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Raz týždenne" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Každý druhý týždeň" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Každých %s dní" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Po jednom týždni" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Po dvoch týždňoch" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Po mesiaci" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Po %s dňoch" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Nainštalovať _aktualizácie" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Aktualizácie softvéru" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Zdrojový" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Zdrojový" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importovať kľúč" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Chyba pri importovaní vybraného súboru" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Chyba pri odstraňovaní kľúča" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -132,11 +140,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Prosím, zadajte názov disku" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Prosím, vložte disk do mechaniky:" @@ -844,16 +852,16 @@ msgstr "Sťahovanie súboru %li z %li pri %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -861,99 +869,99 @@ msgstr "" "Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové " "pripojenie." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Aktualizovať na najnovšiu verziu Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Nainštalovať _aktualizácie" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Verzia %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Získava sa zoznam zmien..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Veľkosť na stiahnutie: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Váš systém je aktuálny" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -961,35 +969,35 @@ msgstr[0] "Môžete nainštalovať %s aktualizáciu" msgstr[1] "Môžete nainštalovať %s aktualizácie" msgstr[2] "Môžete nainštalovať %s aktualizácií" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Čakajte prosím, toto môže chvíľu trvať." -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Aktualizácia je dokončená" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nová verzia: %s (veľkosť: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Verzia %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Vaša distribúcia už nie je podporovaná" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -1000,17 +1008,17 @@ msgstr "" "Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu." "com.\"" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Index softvéru je poškodený" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1375,201 +1383,219 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 - aktualizácie" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Udržiavané komunitou (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Softvér závislý na neslobornom softvéri" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Udržiavané komunitou (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Neslobodné (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neslobodné (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Softvér s obmedzených exportom pre USA" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Nainštalovať _aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiálne podporované" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 - aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 - backporty" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Oficiálne podporované" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 - aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 - backporty" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Neslobodné (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Niektoré programy už nie sú viac oficiálne podporované" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "S obmedzujúcou licenciou" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 bezpečnostné aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 - backporty" @@ -1922,15 +1948,9 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "Binary" #~ msgstr "Binárny" -#~ msgid "Contributed software" -#~ msgstr "Softvér závislý na neslobornom softvéri" - #~ msgid "Non-free software" #~ msgstr "Neslobodný softvér" -#~ msgid "US export restricted software" -#~ msgstr "Softvér s obmedzených exportom pre USA" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 \"Woody\"" diff --git a/po/sr.po b/po/sr.po index 67267f54..c2cd91c3 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic \n" "Language-Team: Serbian \n" @@ -18,108 +18,116 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Svaki dan" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Svaki drugi dan" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Svake nedelje" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Svake druge nedelje" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Svakih %s dana" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Posle jedne nedelje" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Posle dve nedelje" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Posle jednog meseca" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Posle %s dana" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importiranje kljuca" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -127,11 +135,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -760,110 +768,110 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -871,52 +879,52 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1234,183 +1242,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/sv.po b/po/sv.po index 73b452a0..34bd43c1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors \n" "Language-Team: Swedish \n" @@ -17,114 +17,122 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Dagligen" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Varannan dag" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Varje vecka" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Varannan vecka" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Var %s:e dag" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Efter en vecka" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Efter två veckor" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Efter en månad" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Efter %s dagar" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "%d uppdateringar" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, fuzzy, python-format +msgid "%s (%s)" +msgstr "%s - %s/s" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, fuzzy, python-format msgid "Server for %s" msgstr "Server" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Programvaruuppdateringar" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 #, fuzzy msgid "Active" msgstr "Aktivera" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Källkod" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Källkod" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Importera nyckel" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Fel vid importing av vald fil" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Fel vid borttagning av nyckeln" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -135,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Skriv in ett namn på skivan" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Sätt in en skiva i enheten:" @@ -847,16 +855,16 @@ msgstr "Hämtar hem fil %li av %li i %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Hämtar hem fil %li av %li med okänd hastighet" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -864,137 +872,137 @@ msgstr "" "Misslyckades med att hämta listan med ändringar. Kontrollera din " "internetanslutning." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 #, fuzzy msgid "Recommended updates of Ubuntu" msgstr "%d uppdateringar" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Uppdatera till senaste versionen av Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Uppdateringar" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "Det går inte att installera alla tillgängliga uppdateringar" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "Hämtar lista med ändringar..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "Markera _inga" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "Markera _alla" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 #, fuzzy msgid "None" msgstr "en" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 #, fuzzy msgid "1 KB" msgstr "%d kB" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, fuzzy, python-format msgid "%.0f KB" msgstr "%.2f MB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, fuzzy, python-format msgid "%.1f MB" msgstr "%.2f MB" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "Nerladdningsstorlek: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "Ditt system är uppdaterat" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, 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:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "Var god vänta, det här kan ta lite tid" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "Uppdateringen är färdig" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny version: %s (Storlek: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s:" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, fuzzy, python-format msgid "(Size: %s)" msgstr "Storlek:" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "Din distribution stöds inte längre" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 +1012,17 @@ msgstr "" "till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer " "information om att uppgradera." -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "Indexet för program är trasigt" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1380,202 +1388,220 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Uppdateringar" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Gemenskapsunderhållen (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Bidragen programvara" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Gemenskapsunderhållen (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Ickefri (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ickefri (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Programvara med USA-exportbegränsningar" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 #, fuzzy msgid "Recommended updates" msgstr "%d uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "%d uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 #, fuzzy msgid "Backported updates" msgstr "%d uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Stöds officiellt" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Bakåtportar" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "Stöds officiellt" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Bakåtportar" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Ickefri (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Viss programvara har inte längre officiellt stöd" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Begränsad upphovsrätt" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Bakåtportar" @@ -1978,15 +2004,9 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "Bidragen programvara" - #~ msgid "Non-free software" #~ msgstr "Ickefri programvara" -#~ msgid "US export restricted software" -#~ msgstr "Programvara med USA-exportbegränsningar" - #~ msgid "Sources" #~ msgstr "Källor" @@ -3665,9 +3685,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "%%p%%%% (%s of %s) - %s/s" #~ msgstr "%%p%%%% (%s av %s) - %s/s" -#~ msgid "%s - %s/s" -#~ msgstr "%s - %s/s" - #~ msgid "Downloading data..." #~ msgstr "Hämtar data..." diff --git a/po/th.po b/po/th.po index 013adc5c..afcc2d56 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" @@ -16,109 +16,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "ทุกวัน" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "ทุก 2 วัน" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "ทุกอาทิตย์" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "ทุก 2 อาทิตย์" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "ทุก %s วัน" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "หลังจาก 1 อาทิตย์" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "หลังจาก 2 อาทิตย์" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "หลังจาก 1 เดือน" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "หลังจาก %s วัน" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "ซอฟต์แวร์ปรับปรุง" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "นำเข้ากุญแจ" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "ไม่สามารถนำเข้าไฟล์ที่เลือกไว้" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "ไฟล์ที่เลือกไว้อาจจะไม่ใช่ GPG กุญแจไฟล์หรืออาจจะเสียหาย" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "มีปัญหาขณะลบกุจแจ" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -129,11 +137,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิสก์" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:" @@ -807,149 +815,149 @@ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li msgid "Downloading file %li of %li with unknown speed" msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "อูบันตู 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "รุ่น %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "ขนาดดาวน์โหลด: %s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "ระบบของคุณทันสมัยแล้ว" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "ปรับปรุงเสร็จสิ้นแล้ว" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "รุ่นใหม่: %s (ขนาด: %s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "รุ่น %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -959,17 +967,17 @@ msgstr "" "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com " "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "ดัชนีของซอฟแวร์เสียหาย" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1318,201 +1326,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "อูบันตู 5.10 Updates" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "ชุมชนดูแล (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "ไม่ฟรี(ลิขสิทธิ์)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "อูบันตู 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "ชุมชนดูแล (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "อูบันตู 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "_ติดตั้งปรัยปรุง" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "สนับสนุนอย่างเป็นทางการ" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "อูบันตู 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "สนับสนุนอย่างเป็นทางการ" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "อูบันตู 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "จำกัดลิขสิทธิ์" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "อูบันตู 5.10 Backports" diff --git a/po/tr.po b/po/tr.po index bcf26874..f1a299ec 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI \n" "Language-Team: Turkish \n" @@ -17,109 +17,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Günlük" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Her iki günde bir" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Haftalık" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Her iki haftada bir" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Her %s günde bir" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Bir hafta sonra" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "İki hafta sonra" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Bir ay sonra" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s gün sonra" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Kanal Düzenle" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Anahtar aktar" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Seçili dosyayı aktarmada hata" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Anahtar kaldırmada hata" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -130,11 +138,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Lütfen disk için bir isim girin" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Lütfen sürücüye bir disk yerleştirin:" @@ -778,162 +786,162 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1256,196 +1264,211 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Sınırlı telif hakkı" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Resmi olarak desteklenenler" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Resmi olarak desteklenenler" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Resmi olarak desteklenenler" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Sınırlı telif hakkı" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" diff --git a/po/uk.po b/po/uk.po index d9e4931b..2b33d01f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff \n" "Language-Team: Ukrainian \n" @@ -15,113 +15,121 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "Подробиці" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 #, fuzzy msgid "Every two days" msgstr "Кожні %s днів" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Кожні %s днів" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Через %s днів" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Встановлення оновлень..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Оновлення програм" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Текст програми" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Текст програми" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "Імпортувати ключ" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Помилка імпорту вибраного файлу" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Помилка видалення ключа" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -129,11 +137,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "Введіть назву диску" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "Вставте диск в пристрій:" @@ -800,16 +808,16 @@ msgstr "Завантажується файл %li of %li at %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Завантажується файл %li of %li на невизначенії швидкості" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Доступний новий випуск Ubuntu!" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -817,102 +825,102 @@ msgid "" msgstr "" "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Оновлення безпеки Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "Апгрейд системи Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Встановлення оновлень..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 #, fuzzy msgid "Cannot install all available updates" msgstr "Пошук пакунків для апгрейду" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Версія %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Завантаження змін" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "Ваша система оновлена!" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -920,54 +928,54 @@ msgstr[0] "Неможливо провести апргрейд системи" msgstr[1] "Неможливо провести апргрейд системи" msgstr[2] "Неможливо провести апргрейд системи" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 #, fuzzy msgid "Update is complete" msgstr "Завантадення пакунків завершено" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "Версія %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ваш дистрибутив вже не підтримується" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1312,205 +1320,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Оновлення Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Підтримується спільнотою (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Супутнє програмне забезпечення" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Оновлення Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Підтримується спільнотою (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Не-вільний (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Не-вільний (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "ПЗ під експортними обмеженнями США" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Оновлення Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Оновлення безпеки Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Встановлення оновлень..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Офіціально підтримуються" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Оновлення безпеки Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Офіціально підтримуються" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Оновлення безпеки Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Не-вільний (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Офіціально підтримуються" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Обмежені авторські права" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Оновлення безпеки Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Оновлення Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Оновлення Ubuntu 5.10" @@ -1772,15 +1798,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Двійковий" -#~ msgid "Contributed software" -#~ msgstr "Супутнє програмне забезпечення" - #~ msgid "Non-free software" #~ msgstr "Не вільне програмне забезпечення" -#~ msgid "US export restricted software" -#~ msgstr "ПЗ під експортними обмеженнями США" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 \"Woody\"" diff --git a/po/update-manager.pot b/po/update-manager.pot index 8df83d5f..225e73e8 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-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,108 +17,116 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -756,162 +764,162 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1229,183 +1237,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/ur.po b/po/ur.po index 0ca4f881..0064ae7b 100644 --- a/po/ur.po +++ b/po/ur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -17,109 +17,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "روز" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "ھر دو دن" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "ھفتھ وار" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "ھر دو ھفتے" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "ھر %s دن" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "ایک ھفتھ" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "دو ھفتھ باد" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "ایک ماھ باد" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "بعد %s دن" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 #, fuzzy msgid "Import key" msgstr "امپورٹ کی" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -127,11 +135,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -757,162 +765,162 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1231,183 +1239,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/urd.po b/po/urd.po index 19309f94..0a34f9a4 100644 --- a/po/urd.po +++ b/po/urd.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -17,109 +17,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "روز" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "ھر دو دن" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "ھفتھ وار" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "ھر دو ھفتے" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "ھر %s دن" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "ایک ھفتھ" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "دو ھفتھ باد" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "ایک ماھ باد" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "بعد %s دن" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 msgid "Software Channel" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 #, fuzzy msgid "Import key" msgstr "امپورٹ کی" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -127,11 +135,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -757,162 +765,162 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 msgid "Important security updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1231,183 +1239,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 msgid "Important security updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 msgid "Proposed updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/vi.po b/po/vi.po index d2b8372b..0c564a83 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" @@ -16,111 +16,119 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: LocFactoryEditor 1.2.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Hằng ngày" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "Hằng hai ngày" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "Hằng tuần" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "Hằng hai tuần" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "Hằng %s ngày" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "Sau một tuần" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "Sau hai tuần" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "Sau một tháng" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "Sau %s ngày" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Bản cập nhật phần mềm" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "Nguồn" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "Nguồn" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "Gặp lỗi khi nhập tâp tin đã chọn" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 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:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 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:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -128,11 +136,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -766,16 +774,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Có một bản phát hành Ubuntu mới công bố." -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -784,153 +792,153 @@ msgstr "" "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động " "chưa." -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 #, fuzzy msgid "Cannot install all available updates" msgstr "Đang kiểm tra có cập nhật..." -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "Phiên bản %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "Đang tải các thay đổi" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "Hệ thống bạn toàn mới nhất." -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, 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:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, 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:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1272,205 +1280,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Bản cập nhật Ubuntu 5.10" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "Do cộng đồng bảo quản (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "Phần mềm đã đóng góp" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "Không tự do (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Không tự do (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "Phần mềm bị giới hạn xuất Mỹ" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Đang cài đặt bản cập nhật..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Được hỗ trợ một cách chính thức" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "Được hỗ trợ một cách chính thức" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "Không tự do (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "Được hỗ trợ một cách chính thức" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "Bản quyền bị giới hạn" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Bản cập nhật Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" @@ -1713,15 +1739,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Nhị phân" -#~ msgid "Contributed software" -#~ msgstr "Phần mềm đã đóng góp" - #~ msgid "Non-free software" #~ msgstr "Phần mềm không tự do" -#~ msgid "US export restricted software" -#~ msgstr "Phần mềm bị giới hạn xuất Mỹ" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 « Woody »" diff --git a/po/xh.po b/po/xh.po index 3150d03d..1fc12d1e 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -17,109 +17,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "Bonisa izihlaziyo" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "Bonisa izihlaziyo" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -127,11 +135,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -757,165 +765,165 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Kukho i-%i yohlaziyo ekhoyo" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1241,185 +1249,199 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +msgid "Community maintained" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +msgid "Restricted software" +msgstr "" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" +#: ../data/channels/Ubuntu.info.in:79 +msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Bonisa izihlaziyo" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "Bonisa izihlaziyo" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 msgid "No longer oficially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index bf3055a0..b36da2ac 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-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_CN \n" @@ -16,115 +16,123 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "每天" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "每两天" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "每周" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "每两周" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "每%s天" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "一周后" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "两周后" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "一月后" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s天后" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "安装更新" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "软件更新" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "" "二进制\n" "源代码" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "" "二进制\n" "源代码" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "导入密钥" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "在导入所选文件时出错" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "所选文件可能不是GPG密钥文件或者已经损坏." -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "删除密钥时候出错" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你所选择的密钥不能被删除。请汇报这个bug" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -135,11 +143,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "请输入光盘的名称" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "请将光盘插入到光驱里:" @@ -803,148 +811,148 @@ msgstr "正在下载文件 %li/%li 速度是 %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "正在下载文件 %li/%li 速度未知" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "变动列表尚不可用。请稍后再试。" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "变动列表尚不可用。请稍后再试。" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "无法下载更新列表。请检查您的网络连接。" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 安全更新" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "升级到最新版本的Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "安装更新" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "无法安装所有升级" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "正在下载更新列表..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "下载文件大小：%s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "您的系统已为最新" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "你可以安装 %s 个更新" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "请稍等，这需要花一些时间。" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新版本：%s(大小：%s)" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "您的发行版不再被支持" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -954,17 +962,17 @@ msgstr "" "\r\n" "http://www.ubuntu.com 来获取更多有关升级的信息。" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "新发行版 '%s' 可用" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "软件索引已被破坏" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1320,200 +1328,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "社区维护(Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "贡献的软件" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6-06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "社区维护(Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "社区维护(Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "非自由(Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由(Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "美国限制出口的软件" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6-06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "安装更新" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "官方支持" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 移植" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 安全更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 msgid "Oficially supported" msgstr "官方支持" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 移植" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "社区维护(Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "非自由(Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "一些软件已经不在被官方支持." #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "版权限制" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 移植" @@ -1764,11 +1790,5 @@ msgstr "非DFSG兼容软件" #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Contributed software" -#~ msgstr "贡献的软件" - #~ msgid "Non-free software" #~ msgstr "非自由软件" - -#~ msgid "US export restricted software" -#~ msgstr "美国限制出口的软件" diff --git a/po/zh_HK.po b/po/zh_HK.po index 0f4a3c0e..65eb63ef 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-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -15,112 +15,120 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Daily" msgstr "細節" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "正在安裝軟件更新..." -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "軟件更新" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 #, fuzzy msgid "(Source Code)" msgstr "源程式碼" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 #, fuzzy msgid "Source Code" msgstr "源程式碼" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -128,11 +136,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "" @@ -769,170 +777,170 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "Ubuntu 已推出新版本！" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 安全性更新" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 msgid "Updates of Ubuntu" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "正在安裝軟件更新..." -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 #, fuzzy msgid "Cannot install all available updates" msgstr "正在檢查更新套件..." -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "版本 %s: \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 #, fuzzy msgid "Downloading the list of changes..." msgstr "正在下載更改紀錄" -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 #, fuzzy msgid "Your system is up-to-date" msgstr "系統已經在最新狀態！" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "已經不再支援你用的發行版本" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1273,205 +1281,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "協力維護軟件 (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "協力維護軟件" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 更新" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "協力維護軟件 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "非自由軟件 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由軟件 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:87 +#, fuzzy +msgid "By copyright or legal issues restricted software" +msgstr "美國禁止出口軟件" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 更新" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "正在安裝軟件更新..." #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "官方支援" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "官方支援" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "非自由軟件 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "官方支援" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "版權受限" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 更新" @@ -1712,15 +1738,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "可執行檔" -#~ msgid "Contributed software" -#~ msgstr "協力維護軟件" - #~ msgid "Non-free software" #~ msgstr "非自由軟件" -#~ msgid "US export restricted software" -#~ msgstr "美國禁止出口軟件" - #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 “Woody”" diff --git a/po/zh_TW.po b/po/zh_TW.po index f73c1f29..62a2dc1f 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-05 13:07+0200\n" +"POT-Creation-Date: 2006-09-10 01:15+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan \n" "Language-Team: Chinese (Taiwan) \n" @@ -15,109 +15,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "每天" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Every two days" msgstr "每兩天" -#: ../SoftwareProperties/SoftwareProperties.py:137 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Weekly" msgstr "每周" -#: ../SoftwareProperties/SoftwareProperties.py:138 +#: ../SoftwareProperties/SoftwareProperties.py:139 msgid "Every two weeks" msgstr "每隔兩周" -#: ../SoftwareProperties/SoftwareProperties.py:143 +#: ../SoftwareProperties/SoftwareProperties.py:144 #, python-format msgid "Every %s days" msgstr "每隔 %s 天" -#: ../SoftwareProperties/SoftwareProperties.py:166 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After one week" msgstr "一週後" -#: ../SoftwareProperties/SoftwareProperties.py:167 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After two weeks" msgstr "兩週後" -#: ../SoftwareProperties/SoftwareProperties.py:168 +#: ../SoftwareProperties/SoftwareProperties.py:169 msgid "After one month" msgstr "一個月後" -#: ../SoftwareProperties/SoftwareProperties.py:173 +#: ../SoftwareProperties/SoftwareProperties.py:174 #, python-format msgid "After %s days" msgstr "%s 天過後" #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu -#: ../SoftwareProperties/SoftwareProperties.py:235 +#: ../SoftwareProperties/SoftwareProperties.py:252 #, fuzzy, python-format msgid "%s updates" msgstr "安裝更新套件(_I)" -#: ../SoftwareProperties/SoftwareProperties.py:294 +#. TRANSLATORS: Label for the components in the Internet section +#. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe +#: ../SoftwareProperties/SoftwareProperties.py:264 +#, python-format +msgid "%s (%s)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:316 msgid "Main server" msgstr "" #. TRANSLATORS: %s is a country -#: ../SoftwareProperties/SoftwareProperties.py:298 -#: ../SoftwareProperties/SoftwareProperties.py:316 +#: ../SoftwareProperties/SoftwareProperties.py:320 +#: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format msgid "Server for %s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:302 +#: ../SoftwareProperties/SoftwareProperties.py:324 msgid "Nearest server" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:323 +#: ../SoftwareProperties/SoftwareProperties.py:345 msgid "Custom servers" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:580 -#: ../SoftwareProperties/SoftwareProperties.py:597 +#: ../SoftwareProperties/SoftwareProperties.py:601 +#: ../SoftwareProperties/SoftwareProperties.py:618 #, fuzzy msgid "Software Channel" msgstr "軟體更新" -#: ../SoftwareProperties/SoftwareProperties.py:588 -#: ../SoftwareProperties/SoftwareProperties.py:605 +#: ../SoftwareProperties/SoftwareProperties.py:609 +#: ../SoftwareProperties/SoftwareProperties.py:626 msgid "Active" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:690 +#: ../SoftwareProperties/SoftwareProperties.py:711 msgid "(Source Code)" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:696 +#: ../SoftwareProperties/SoftwareProperties.py:717 msgid "Source Code" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:945 +#: ../SoftwareProperties/SoftwareProperties.py:966 msgid "Import key" msgstr "匯入金鑰" -#: ../SoftwareProperties/SoftwareProperties.py:955 +#: ../SoftwareProperties/SoftwareProperties.py:976 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:956 +#: ../SoftwareProperties/SoftwareProperties.py:977 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:968 +#: ../SoftwareProperties/SoftwareProperties.py:989 msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:969 +#: ../SoftwareProperties/SoftwareProperties.py:990 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:1015 +#: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" "Error scaning the CD\n" @@ -128,11 +136,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:1072 +#: ../SoftwareProperties/SoftwareProperties.py:1093 msgid "Please enter a name for the disc" msgstr "請輸入光碟的名稱" -#: ../SoftwareProperties/SoftwareProperties.py:1088 +#: ../SoftwareProperties/SoftwareProperties.py:1109 msgid "Please insert a disc in the drive:" msgstr "請將光碟放入光碟機：" @@ -796,149 +804,149 @@ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" msgid "Downloading file %li of %li with unknown speed" msgstr "正在下載檔案 %li/%li，下載速度不明" -#: ../UpdateManager/UpdateManager.py:187 +#: ../UpdateManager/UpdateManager.py:197 #, fuzzy msgid "The list of changes is not available" msgstr "修改紀錄不存在，請稍後再試。" -#: ../UpdateManager/UpdateManager.py:193 +#: ../UpdateManager/UpdateManager.py:203 msgid "The list of changes is not available yet. Please try again later." msgstr "修改紀錄不存在，請稍後再試。" -#: ../UpdateManager/UpdateManager.py:198 +#: ../UpdateManager/UpdateManager.py:208 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "無法下載更動列表。請檢查網路連線是否正常。" -#: ../UpdateManager/UpdateManager.py:218 +#: ../UpdateManager/UpdateManager.py:228 #, fuzzy msgid "Important security updates of Ubuntu" msgstr "Ubuntu 5.10 安全性更新" -#: ../UpdateManager/UpdateManager.py:220 +#: ../UpdateManager/UpdateManager.py:230 msgid "Recommended updates of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:232 msgid "Proposed updates for Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:223 +#: ../UpdateManager/UpdateManager.py:233 msgid "Backports of Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:224 +#: ../UpdateManager/UpdateManager.py:234 #, fuzzy msgid "Updates of Ubuntu" msgstr "升級到最新版本的 Ubuntu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245 +#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 #, fuzzy msgid "Other updates" msgstr "安裝更新套件(_I)" -#: ../UpdateManager/UpdateManager.py:266 +#: ../UpdateManager/UpdateManager.py:276 msgid "Cannot install all available updates" msgstr "無法安裝所有更新套件" -#: ../UpdateManager/UpdateManager.py:267 +#: ../UpdateManager/UpdateManager.py:277 msgid "" -"Some of the updates require more extensive changesthan expected.\n" +"Some of the updates require more extensive changes than expected.\n" "\n" -"This usually mean that your system is not fully upgraded or that you run a " +"This usually means that you have enabled unoffical repositories, that it is " +"not fully upgraded from the last distribution release or that you run a " "development release of the distribution.\n" "\n" "Would you like to perform a full distribution upgrade now?" msgstr "" -#: ../UpdateManager/UpdateManager.py:461 +#: ../UpdateManager/UpdateManager.py:474 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:522 +#: ../UpdateManager/UpdateManager.py:535 msgid "Downloading the list of changes..." msgstr "正在下載修改紀錄..." -#: ../UpdateManager/UpdateManager.py:546 +#: ../UpdateManager/UpdateManager.py:559 msgid "Select _None" msgstr "" -#: ../UpdateManager/UpdateManager.py:551 +#: ../UpdateManager/UpdateManager.py:565 msgid "Select _All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:591 +#: ../UpdateManager/UpdateManager.py:596 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:594 +#: ../UpdateManager/UpdateManager.py:599 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:597 +#: ../UpdateManager/UpdateManager.py:602 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:600 +#: ../UpdateManager/UpdateManager.py:605 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618 -#: ../UpdateManager/UpdateManager.py:642 +#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 #, python-format msgid "Download size: %s" msgstr "下載大小：%s" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:632 msgid "Your system is up-to-date" msgstr "系統已經在最新狀態" -#: ../UpdateManager/UpdateManager.py:638 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "您可以安裝 %s 個更新" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:671 +#: ../UpdateManager/UpdateManager.py:676 msgid "Please wait, this can take some time." msgstr "請稍候，這可能需要一點時間。" -#: ../UpdateManager/UpdateManager.py:673 +#: ../UpdateManager/UpdateManager.py:678 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:822 +#: ../UpdateManager/UpdateManager.py:830 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新版本：%s （大小：%s）" -#: ../UpdateManager/UpdateManager.py:826 +#: ../UpdateManager/UpdateManager.py:834 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:836 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:842 +#: ../UpdateManager/UpdateManager.py:846 msgid "Your distribution is not supported anymore" msgstr "您正使用的發行版本已不再支援" -#: ../UpdateManager/UpdateManager.py:843 +#: ../UpdateManager/UpdateManager.py:847 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 " @@ -947,17 +955,17 @@ msgstr "" "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 " "http://www.ubuntu.com以取得更多升級資訊。" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:866 #, python-format msgid "New distribution release '%s' is available" msgstr "有新的 distribution 發行版 '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:897 +#: ../UpdateManager/UpdateManager.py:901 msgid "Software index is broken" msgstr "軟體索引損壞" -#: ../UpdateManager/UpdateManager.py:898 +#: ../UpdateManager/UpdateManager.py:902 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 " @@ -1306,201 +1314,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../data/channels/Ubuntu.info.in:7 +#: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" +#. CompDescription +#: ../data/channels/Ubuntu.info.in:15 +#, fuzzy +msgid "Community maintained" +msgstr "協力維護軟體 (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:20 +msgid "Proprietary drivers for devices" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:23 +#, fuzzy +msgid "Restricted software" +msgstr "非自由軟體 (Multiverse)" + #. Description -#: ../data/channels/Ubuntu.info.in:28 +#: ../data/channels/Ubuntu.info.in:29 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 ‘Dapper Drake‘" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:73 -msgid "" -"OpenSource software that is officially supported by Canonical Ltd. (main)" +#: ../data/channels/Ubuntu.info.in:75 +msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:76 +#: ../data/channels/Ubuntu.info.in:78 #, fuzzy msgid "Community maintained (universe)" msgstr "協力維護軟體 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:77 -msgid "OpenSource software that is maintained by the community (universe)" -msgstr "" +#: ../data/channels/Ubuntu.info.in:79 +#, fuzzy +msgid "Community maintained Open Source software" +msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:80 +#: ../data/channels/Ubuntu.info.in:82 #, fuzzy msgid "Non-free drivers" msgstr "非自由軟體 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:81 -msgid "Proprietary drivers for devices (restricted) " +#: ../data/channels/Ubuntu.info.in:83 +msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:84 +#: ../data/channels/Ubuntu.info.in:86 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由軟體 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:85 -msgid "Software that is restricted by copyright or legal issues (multiverse)" +#: ../data/channels/Ubuntu.info.in:87 +msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:90 +#: ../data/channels/Ubuntu.info.in:92 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 ‘Dapper Drake‘" #. Description -#: ../data/channels/Ubuntu.info.in:104 +#: ../data/channels/Ubuntu.info.in:106 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:111 +#: ../data/channels/Ubuntu.info.in:113 msgid "Recommended updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:118 +#: ../data/channels/Ubuntu.info.in:120 #, fuzzy msgid "Proposed updates" msgstr "安裝更新套件(_I)" #. Description -#: ../data/channels/Ubuntu.info.in:125 +#: ../data/channels/Ubuntu.info.in:127 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:131 +#: ../data/channels/Ubuntu.info.in:134 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. CompDescription -#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "官方支援" #. Description -#: ../data/channels/Ubuntu.info.in:148 +#: ../data/channels/Ubuntu.info.in:151 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/channels/Ubuntu.info.in:162 +#: ../data/channels/Ubuntu.info.in:165 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:169 +#: ../data/channels/Ubuntu.info.in:172 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:176 +#: ../data/channels/Ubuntu.info.in:179 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 回移套件" #. Description -#: ../data/channels/Ubuntu.info.in:182 +#: ../data/channels/Ubuntu.info.in:186 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/channels/Ubuntu.info.in:199 +#: ../data/channels/Ubuntu.info.in:203 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:207 #, fuzzy msgid "Oficially supported" msgstr "官方支援" #. Description -#: ../data/channels/Ubuntu.info.in:213 +#: ../data/channels/Ubuntu.info.in:217 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:220 +#: ../data/channels/Ubuntu.info.in:224 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:227 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 回移套件" #. Description -#: ../data/channels/Ubuntu.info.in:233 +#: ../data/channels/Ubuntu.info.in:237 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. CompDescription -#: ../data/channels/Ubuntu.info.in:242 +#: ../data/channels/Ubuntu.info.in:246 msgid "Community maintained (Universe)" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:245 +#: ../data/channels/Ubuntu.info.in:249 msgid "Non-free (Multiverse)" msgstr "非自由軟體 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:250 +#: ../data/channels/Ubuntu.info.in:254 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:258 #, fuzzy msgid "No longer oficially supported" msgstr "有些軟體不再有官方支援" #. CompDescription -#: ../data/channels/Ubuntu.info.in:257 +#: ../data/channels/Ubuntu.info.in:261 msgid "Restricted copyright" msgstr "版權受限制" #. Description -#: ../data/channels/Ubuntu.info.in:264 +#: ../data/channels/Ubuntu.info.in:268 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:271 +#: ../data/channels/Ubuntu.info.in:275 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:278 +#: ../data/channels/Ubuntu.info.in:282 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 回移套件" diff --git a/tests/data/sources.list.testDistribution b/tests/data/sources.list.testDistribution index 031e4c51..1687c504 100644 --- a/tests/data/sources.list.testDistribution +++ b/tests/data/sources.list.testDistribution @@ -6,4 +6,6 @@ deb http://de.archive.ubuntu.com/ubuntu/ edgy-updates restricted deb http://de.archive.ubuntu.com/ubuntu/ edgy-security main deb http://de.archive.ubuntu.com/ubuntu/ edgy-security multiverse deb http://ftp.debian.org/debian sid main -deb http://de.archive.ubuntu.com/ubuntu/ breezy main \ No newline at end of file +deb ftp://ubuntu.cs.utah.edu/pub/ubuntu/ubuntu/ breezy main +deb ftp://ubuntu.cs.utah.edu/pub/ubuntu/ubuntu/ breezy-backports main +deb http://archive.ubuntu.com/ubuntu/ hoary main diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 1db99e3c..3ee106be 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -81,6 +81,15 @@ class TestAptSources(unittest.TestCase): sources = aptsources.SourcesList() distro = aptsources.Distribution() distro.get_sources(sources) + # test if all suits of the current distro were detected correctly + dist_templates = set() + for s in sources: + if s.template: + dist_templates.add(s.template.name) + #print dist_templates + for d in ["edgy","edgy-security","edgy-updates","hoary","breezy", "breezy-backports"]: + self.assertTrue(d in dist_templates) + # test enable comp = "restricted" distro.enable_component(sources, comp) found = {} @@ -103,8 +112,8 @@ class TestAptSources(unittest.TestCase): found = {} for entry in sources: if (entry.type == "deb" and - entry.uri == "http://de.archive.ubuntu.com/ubuntu/" and - "edgy" in entry.dist): + entry.template and + entry.template.name == "edgy"): for c in entry.comps: if c == comp: if not found.has_key(entry.dist): -- cgit v1.2.3 From 698f03ea61b8a3b466f97f26ac21746c3a4efecb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Sep 2006 09:46:26 +0200 Subject: * updated changelog * added two other known bugs --- debian/changelog | 4 +++- debian/control | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d83e1323..413dcfce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ update-manager (0.44.10) edgy; urgency=low - fix add_component() to avoid duplicated components - added MirrorsFile key to DistInfo code to have a better idea about the available mirrors + * debian/control: + - updated dbus dependencies (lp: #59862) - -- Michael Vogt Sun, 10 Sep 2006 00:01:29 +0200 + -- Michael Vogt Mon, 11 Sep 2006 09:38:21 +0200 update-manager (0.44.9) edgy; urgency=low diff --git a/debian/control b/debian/control index af942223..e3c72b8d 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: update-manager Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes +Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus Recommends: python-gnome2 Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user -- cgit v1.2.3 From ae9b9d7ef570cd75c9da0452693427fabf4fb2c1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 12 Sep 2006 15:41:51 +0200 Subject: * UpdateManager/UpdateManager.py: - make sure to always have a srcver --- UpdateManager/UpdateManager.py | 5 ++++- debian/changelog | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index b9ce315c..f1cb35a5 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -120,7 +120,7 @@ class MyCache(apt.Cache): # don't touch the gui in this function, it needs to be thread-safe pkg = self[name] - # get the src package name + # get the src package name srcpkg = pkg.sourcePackageName # assume "main" section @@ -146,6 +146,9 @@ class MyCache(apt.Cache): #print "srcver: %s" % srcver section = srcrecords.Section #print "srcsect: %s" % section + else: + # fail into the error handler + raise SystemError except SystemError, e: srcver = binver diff --git a/debian/changelog b/debian/changelog index 413dcfce..e6628ed7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +update-manager (0.44.11) edgy; urgency=low + + * UpdateManager/UpdateManager.py: + - fix error in get_changelog (lp: #59940). + Thanks to Denis Washington + + -- + update-manager (0.44.10) edgy; urgency=low * aptsources.py: -- cgit v1.2.3 From 23a9a469d3189e9ec1ed40bfe1c707e2a8916d70 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 12 Sep 2006 15:47:10 +0200 Subject: * prepared new upload --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e6628ed7..935cfd85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,12 @@ update-manager (0.44.11) edgy; urgency=low * UpdateManager/UpdateManager.py: - fix error in get_changelog (lp: #59940). Thanks to Denis Washington + - bugfix in the ListStore + - use the update-manager desktop file when runing synaptic + as the backend to get a consistent UI + - UI improvements (thanks to Sebastian Heinlein!) - -- + -- Michael Vogt Tue, 12 Sep 2006 15:43:16 +0200 update-manager (0.44.10) edgy; urgency=low -- cgit v1.2.3 From 3cb8e9aab902baaf454edd0020318d15f028682e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Sep 2006 09:23:59 +0200 Subject: * removed branding --- UpdateManager/UpdateManager.py | 13 ++++++------- debian/changelog | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 8f523202..3fe9ad1e 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -228,13 +228,12 @@ class UpdateList: dist = pipe.read().strip() del pipe - templates = [("%s-security" % dist, "Ubuntu", _("Important security updates" - " of Ubuntu"), 10), - ("%s-updates" % dist, "Ubuntu", _("Recommended updates of " - "Ubuntu"), 9), - ("%s-proposed" % dist, "Ubuntu", _("Proposed updates for Ubuntu"), 8), - ("%s-backports" % dist, "Ubuntu", _("Backports of Ubuntu"), 7), - (dist, "Ubuntu", _("Updates of Ubuntu"), 6)] + templates = [("%s-security" % dist, "Ubuntu", _("Important security updates") + , 10), + ("%s-updates" % dist, "Ubuntu", _("Recommended updates"), 9), + ("%s-proposed" % dist, "Ubuntu", _("Proposed updates"), 8), + ("%s-backports" % dist, "Ubuntu", _("Backports"), 7), + (dist, "Ubuntu", _("Normal updates"), 6)] self.pkgs = {} self.matcher = {} diff --git a/debian/changelog b/debian/changelog index 0e54d70b..71fd5f23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ update-manager (0.44.11) edgy; urgency=low - use the update-manager desktop file when runing synaptic as the backend to get a consistent UI - UI improvements (thanks to Sebastian Heinlein!) + - remove branding - -- + -- Michael Vogt Tue, 12 Sep 2006 20:37:55 +0200 update-manager (0.44.10) edgy; urgency=low -- cgit v1.2.3 From c5c5f86db727831f68c93e7a388e4e2cb8491cb6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Sep 2006 16:51:08 +0200 Subject: * typo fixes (thanks to Bruce Cowan) --- DistUpgrade/DistUpgradeCache.py | 4 ++-- DistUpgrade/DistUpgradeControler.py | 2 +- DistUpgrade/DistUpgradeViewGtk.py | 12 ++++++------ SoftwareProperties/SoftwareProperties.py | 2 +- UpdateManager/DistUpgradeFetcher.py | 2 +- data/channels/Ubuntu.info.in | 14 +++++++------- data/update-manager.schemas.in | 4 ++-- debian/changelog | 8 ++++++++ 8 files changed, 28 insertions(+), 20 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 680e7d9e..3c0efffa 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -155,7 +155,7 @@ class MyCache(apt.Cache): except SystemError, e: # FIXME: change the text to something more useful view.error(_("Could not calculate the upgrade"), - _("A unresolvable problem occured while " + _("A unresolvable problem occurred while " "calculating the upgrade.\n\n" "Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ " @@ -259,7 +259,7 @@ class MyCache(apt.Cache): "ubuntu-desktop, kubuntu-desktop or " "edubuntu-desktop package and it was not " "possible to detect which version of " - "ubuntu you are runing.\n " + "ubuntu you are running.\n " "Please install one of the packages " "above first using synaptic or " "apt-get before proceeding.")) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 800590cb..52670371 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -293,7 +293,7 @@ class DistUpgradeControler(object): if self.sources_disabled: self._view.information(_("Third party sources disabled"), - _("Some third party entries in your souces.list " + _("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." diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 5a3779e9..1385d18f 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -484,19 +484,19 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): if pkgs_remove > 0: # FIXME: make those two seperate lines to make it clear # that the "%" applies to the result of ngettext - msg += gettext.ngettext("%s package is going to be removed.", - "%s packages are going to be removed.", + msg += gettext.ngettext("%d package is going to be removed.", + "%d packages are going to be removed.", pkgs_remove) % pkgs_remove msg += " " if pkgs_inst > 0: - msg += gettext.ngettext("%s new package is going to be " + msg += gettext.ngettext("%d new package is going to be " "installed.", - "%s new packages are going to be " + "%d new packages are going to be " "installed.",pkgs_inst) % pkgs_inst msg += " " if pkgs_upgrade > 0: - msg += gettext.ngettext("%s package is going to be upgraded.", - "%s packages are going to be upgraded.", + msg += gettext.ngettext("%d package is going to be upgraded.", + "%d packages are going to be upgraded.", pkgs_upgrade) % pkgs_upgrade msg +=" " if downloadSize > 0: diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index f2a2cc19..1c8a3425 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -1033,7 +1033,7 @@ class SoftwareProperties(SimpleGladeApp): type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK, message_format=None) - dialog.set_markup(_("Error scaning the CD\n\n%s"%msg)) + dialog.set_markup(_("Error scanning the CD\n\n%s"%msg)) res = dialog.run() dialog.destroy() return diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index af07cfb4..cda27e2f 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -219,7 +219,7 @@ class DistUpgradeFetcher(object): if not self.verifyDistUprader(): error(self.window_main, _("Verfication failed"), - _("Verfing the upgrade failed. There may be a problem " + _("Verifying the upgrade failed. There may be a problem " "with the network or with the server. ")) self.cleanup() return diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index d6070790..1afc66c9 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -25,7 +25,7 @@ BaseURI: cdrom:\[Ubuntu.*6.10 _Description: Cdrom with Ubuntu 6.10 'Edgy Eft' Available: False Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright @@ -76,7 +76,7 @@ BaseURI: cdrom:\[Ubuntu.*6.06 _Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' Available: False Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright @@ -123,7 +123,7 @@ BaseURI: cdrom:\[Ubuntu.*5.10 _Description: Cdrom with Ubuntu 5.10 'Breezy Badger' Available: False Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright @@ -151,7 +151,7 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright Component: universe @@ -165,7 +165,7 @@ BaseURI: cdrom:\[Ubuntu.*5.04 _Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' Available: False Component: main -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright @@ -192,7 +192,7 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 'Warty Warthog' Component: main -_CompDescription: No longer oficially supported +_CompDescription: No longer officially supported Component: restricted _CompDescription: Restricted copyright Component: universe @@ -206,7 +206,7 @@ BaseURI: cdrom:\[Ubuntu.*4.10 _Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main -_CompDescription: No longer oficially supported +_CompDescription: No longer officially supported Component: restricted _CompDescription: Restricted copyright diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index ad72c893..3740318c 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -11,7 +11,7 @@ Remind to reload the channel list - If automatic checking for updates is disabeld, you have + If automatic checking for updates is disabled, you have to reload the channel list manually. This option allows to hide the reminder shown in this case. @@ -28,7 +28,7 @@ Show details of an update Stores the state of the expander that contains the - list of changs and the description + list of changes and the description diff --git a/debian/changelog b/debian/changelog index 71fd5f23..a6886655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +update-manager (0.44.12) edgy; urgency=low + + * DistUpgrade/DistUpgradeViewGtk.py: + - use '%d' instead of '%s' where appropriate + * fixed lots of typos (lp: #60633) + + -- Michael Vogt Mon, 18 Sep 2006 16:37:52 +0200 + update-manager (0.44.11) edgy; urgency=low * UpdateManager/UpdateManager.py: -- cgit v1.2.3 From 33d4c53df7e8daeacb6034815ff39fb5ebc4d32a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Sep 2006 17:17:04 +0200 Subject: * changelog updated --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a6886655..0346d48e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ update-manager (0.44.12) edgy; urgency=low * DistUpgrade/DistUpgradeViewGtk.py: - - use '%d' instead of '%s' where appropriate + - use '%d' instead of '%s' where appropriate (lp: #60239) * fixed lots of typos (lp: #60633) -- Michael Vogt Mon, 18 Sep 2006 16:37:52 +0200 -- cgit v1.2.3 From 1dd21dbda1eeee6daf6eaf4a2f7c4bf1ce25ce08 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Sep 2006 11:35:13 +0200 Subject: * DistUpgrade/DistUpgradeCache.py, UpdateManager/UpdateManager.py: - filter out python-apt warnings * UpdateManager/UpdateManager.py: - make sure that src_ver is always initialized --- DistUpgrade/DistUpgradeCache.py | 1 + UpdateManager/UpdateManager.py | 4 ++++ debian/changelog | 9 +++++++++ 3 files changed, 14 insertions(+) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 3c0efffa..4b6fd680 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -1,6 +1,7 @@ import warnings warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) import apt import apt_pkg import os diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 3fe9ad1e..0d70b56c 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -33,8 +33,11 @@ try: except: import fakegconf as gconf import gobject +from warnings import warn +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) import apt import apt_pkg + import gettext import copy import string @@ -130,6 +133,7 @@ class MyCache(apt.Cache): # get the source version, start with the binaries version binver = pkg.candidateVersion + srcver = pkg.candidateVersion #print "bin: %s" % binver try: # try to get the source version of the pkg, this differs diff --git a/debian/changelog b/debian/changelog index 0346d48e..7c759639 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +update-manager (0.44.13) edgy; urgency=low + + * UpdateManager/UpdateManager.py: + - make sure that src_ver is always initialized (thanks to + Simira for reporting) + - filter python-apt future warning (especially for seb128) + + -- + update-manager (0.44.12) edgy; urgency=low * DistUpgrade/DistUpgradeViewGtk.py: -- cgit v1.2.3 From b5549bd1e07a6d3dfa41f97116e687709ed4da78 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 23 Sep 2006 02:23:38 +0200 Subject: * changelog, README updated * DistUpgrade/build-tarball.sh: - cleanup better * po/*: - make update-po --- DistUpgrade/Changelog | 4 + DistUpgrade/README | 9 +- DistUpgrade/build-tarball.sh | 3 + debian/changelog | 2 +- po/ar.po | 458 +++++++++++++++++---------------- po/bg.po | 545 +++++++++++++++++++++------------------- po/bn.po | 531 ++++++++++++++++++++------------------- po/br.po | 458 +++++++++++++++++---------------- po/ca.po | 550 +++++++++++++++++++++------------------- po/cs.po | 546 +++++++++++++++++++++------------------- po/da.po | 532 ++++++++++++++++++++------------------- po/de.po | 551 +++++++++++++++++++++------------------- po/el.po | 552 +++++++++++++++++++++------------------- po/en_AU.po | 550 +++++++++++++++++++++------------------- po/en_CA.po | 490 ++++++++++++++++++------------------ po/en_GB.po | 489 ++++++++++++++++++------------------ po/es.po | 550 +++++++++++++++++++++------------------- po/fi.po | 558 +++++++++++++++++++++-------------------- po/fr.po | 553 +++++++++++++++++++++------------------- po/fur.po | 458 +++++++++++++++++---------------- po/gl.po | 487 ++++++++++++++++++------------------ po/he.po | 526 ++++++++++++++++++++------------------ po/hi.po | 458 +++++++++++++++++---------------- po/hr.po | 549 +++++++++++++++++++++------------------- po/hu.po | 550 +++++++++++++++++++++------------------- po/id.po | 549 +++++++++++++++++++++------------------- po/it.po | 551 +++++++++++++++++++++------------------- po/ja.po | 551 +++++++++++++++++++++------------------- po/ka.po | 534 ++++++++++++++++++++------------------- po/ko.po | 550 +++++++++++++++++++++------------------- po/ku.po | 486 ++++++++++++++++++------------------ po/lt.po | 548 +++++++++++++++++++++------------------- po/mk.po | 490 ++++++++++++++++++------------------ po/ms.po | 483 +++++++++++++++++------------------ po/nb.po | 550 +++++++++++++++++++++------------------- po/ne.po | 489 ++++++++++++++++++------------------ po/nl.po | 552 +++++++++++++++++++++------------------- po/no.po | 489 ++++++++++++++++++------------------ po/oc.po | 480 +++++++++++++++++------------------ po/pa.po | 472 +++++++++++++++++------------------ po/pl.po | 550 +++++++++++++++++++++------------------- po/pt.po | 551 +++++++++++++++++++++------------------- po/pt_BR.po | 553 +++++++++++++++++++++------------------- po/ro.po | 509 +++++++++++++++++++------------------ po/ru.po | 549 +++++++++++++++++++++------------------- po/rw.po | 485 +++++++++++++++++------------------ po/sk.po | 551 +++++++++++++++++++++------------------- po/sr.po | 458 +++++++++++++++++---------------- po/sv.po | 583 +++++++++++++++++++++++-------------------- po/th.po | 547 +++++++++++++++++++++------------------- po/tr.po | 491 ++++++++++++++++++------------------ po/uk.po | 509 +++++++++++++++++++------------------ po/update-manager.pot | 458 +++++++++++++++++---------------- po/ur.po | 458 +++++++++++++++++---------------- po/urd.po | 458 +++++++++++++++++---------------- po/vi.po | 487 ++++++++++++++++++------------------ po/xh.po | 471 +++++++++++++++++----------------- po/zh_CN.po | 547 +++++++++++++++++++++------------------- po/zh_HK.po | 487 ++++++++++++++++++------------------ po/zh_TW.po | 546 +++++++++++++++++++++------------------- 60 files changed, 15130 insertions(+), 13851 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 33ecff3d..54d194e6 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,7 @@ +2006-09-23: + - support fetching backports of selected packages first and + use them for the upgrade (needed to support Breaks) + - fetch/use apt/dpkg/python-apt backports for the upgrade 2006-09-06: - increased the "free-space-savety-buffer" to 100MB 2006-09-05: diff --git a/DistUpgrade/README b/DistUpgrade/README index 60c761d6..c38a422f 100644 --- a/DistUpgrade/README +++ b/DistUpgrade/README @@ -46,4 +46,11 @@ ForcedObsoletes: [Sources] - how to rewrite the sources.list -[Network] - network specific options \ No newline at end of file +[Network] - network specific options + +[Backports] - use specific packages for dist-upgrade +Packages= List of what packages to look for +VersionIdent=Version identification. needs to be uniq, dist-upgrader will + fetch the version that contains this string +SourcesList=a sources.list fragment that will be placed into + /etc/apt/sources.list.d and that contains the backported pkgs \ No newline at end of file diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh index 4f88b848..df9d6506 100755 --- a/DistUpgrade/build-tarball.sh +++ b/DistUpgrade/build-tarball.sh @@ -3,7 +3,10 @@ DIST=edgy # cleanup +echo "Cleaning up" rm -f *~ *.bak *.pyc *.moved '#'* +sudo rm -rf backports/ profile/ result/ tarball/ *.deb + # update po (cd ../po; make update-po) diff --git a/debian/changelog b/debian/changelog index 7c759639..6631a01b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ update-manager (0.44.13) edgy; urgency=low Simira for reporting) - filter python-apt future warning (especially for seb128) - -- + -- Michael Vogt Sat, 23 Sep 2006 00:53:06 +0200 update-manager (0.44.12) edgy; urgency=low diff --git a/po/ar.po b/po/ar.po index 5a87efcd..dbd73c4a 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi \n" "Language-Team: Arabic \n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "الرجاء ادخال اسم القرص" msgid "Please insert a disc in the drive:" msgstr "الرجاء ادخال القرص في الجهاز" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "قراءة من الكاش" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "importing" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "مصدر الطرف الثالث غير مفعل" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "خطاء خلال التحديث" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "لا يوجد مساحة كافية على القرص الصلب" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "هل تريد البدء في عملية التحديث الان؟" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -438,7 +443,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -470,19 +475,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -492,31 +503,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -524,36 +535,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -587,11 +601,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -622,7 +636,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -743,8 +757,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -767,110 +781,94 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -878,52 +876,56 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -939,84 +941,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1120,10 +1134,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1150,10 +1164,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1203,7 +1217,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1222,7 +1236,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1246,192 +1260,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/bg.po b/po/bg.po index d81f750b..81077455 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" @@ -132,9 +132,9 @@ msgstr "" "грешка." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -150,11 +150,11 @@ msgstr "Моля, въведете име за диска" msgid "Please insert a disc in the drive:" msgstr "Моля, поставете диск в устройството:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Повредени пакети" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -163,23 +163,23 @@ msgstr "" "този софтуер. Моля, поправете ги със synaptic или apt-get преди да " "продължите!" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Не може да бъдат надградени изисквани мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ще трябва да бъде премахнат важен пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Не може да бъде планирано надграждането" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -188,11 +188,11 @@ msgstr "" "това като грешка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Грешка при удостоверяването автентичността на някои пакети" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Не може да се инсталира '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -216,15 +216,16 @@ msgstr "" "грешка! " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Не могат да бъдат предположени мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -233,12 +234,12 @@ msgstr "" " Моля, преди да продължите, инсталирайте един от тези пакети, като " "използвате synaptic или apt-get!" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Грешка при доставянето" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -248,15 +249,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Четене на кеша" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Не е открит валиден огледален сървър" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -288,11 +289,11 @@ msgstr "" "Ако изберете \"Не\", актуализирането ще бъде отменено." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Генериране на източници по подразбиране?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -306,11 +307,11 @@ msgstr "" "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", " "актуализацията ще бъде отменена." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Информацията от хранилището е невалидна" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -318,13 +319,14 @@ msgstr "" "Надграждане на информацията от хранилището доведе до невалиден файл. Моля, " "съобщете това като грешка!" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Забранени са източници от трети страни" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -332,11 +334,11 @@ msgstr "" "Можете да ги разрешите отново след надграждането чрез инструмента software-" "properties или чрез synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Грешка по време на надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -344,11 +346,11 @@ msgstr "" "Възникна проблем при актуализацията. Това обикновено е накакъв проблем с " "мрежата. Моля, проверете мрежовата връзка и опитайте пак!" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Недостатъчно свободно място на диска" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +359,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Желаете ли да започне надграждането?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Не можеше да бъдат инсталирани надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +379,11 @@ msgstr "" "Надграждането сега ще бъде прекратено. Системата Ви може да е в " "неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Не можеше да бъдат свалени надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,36 +391,36 @@ msgstr "" "Надграждането се прекратява. Моля, проверете Интернет връзката или " "инсталационния носител и опитайте отново! " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Премахване на остарелите пакети?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "П_рескачане на стъпката" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Премахване" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Грешка при прехвърляне" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -427,27 +429,32 @@ msgstr "" "информация! " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Рестартиране на системата" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Проверка на диспечера на пакети" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Актуализиране информацията от хранилището" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 #, fuzzy msgid "Invalid package information" msgstr "Невалидна информация за пакет" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -460,19 +467,19 @@ msgstr "" "бъде открит.\n" "Това показва сериозна грешка. Моля, съобщете за това!" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Запитване за потвърждение" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Търсене на остарял софтуер" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Надграждането на системата завърши." @@ -493,7 +500,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Сваляне на файл %li от %li при %s/сек" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -523,23 +530,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Замяна на конфигурационния файл\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Командата \"diff\" не бе намерена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Възникна фатална грешка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -555,28 +568,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Пакетът %s ще бъде премахнат." msgstr[1] "Пакетите %s ще бъдат премахнати." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s нов пакет ще бъде инсталиран." msgstr[1] "%s нови пакети ще бъдат инталирани." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s пакет ще бъде надграден." msgstr[1] "%s нови пакети ще бъдат надградени." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -584,7 +597,7 @@ msgid "" "You have to download a total of %s. " msgstr "Трябва да изтеглите данни общо %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -593,32 +606,35 @@ msgstr "" "Надграждането може да отнеме няколко часа, като не може да бъде отменено по-" "нататък." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "За да предодвратите загуба на данни, затворете всички отворени приложения и " "документи." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Не можеше да бъдат намерени надграждания" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Системата Ви е актуална" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Системата Ви вече е надградена." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Премахване на %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Инсталиране на %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Надграждане на %s" @@ -652,11 +668,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Нужно е рестартиране" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Надграждането е завършено и има нужда от рестарт. Рестартиране сега?" @@ -692,10 +708,8 @@ msgid "Start the upgrade?" msgstr "Започване на надграждането?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Надграждане до Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -822,9 +836,10 @@ msgid "Verfication failed" msgstr "Грешка при удостоверяване" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Удостоверяването на надграждането не успя. Възможно е да има проблем с " "мрежата или със сървъра. " @@ -851,16 +866,16 @@ msgstr "Сваляне на файл %li от %li при %s/сек" msgid "Downloading file %li of %li with unknown speed" msgstr "Сваляне на файл %li от %li при неизвестна скорост" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -868,134 +883,125 @@ msgstr "" "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет " "връзката си." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 актуализации на сигурността" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Инсталиране на актуализациите" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Надграждане до последната версия на Ubuntu" +msgid "Normal updates" +msgstr "_Инсталиране на актуализациите" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Инсталиране на актуализациите" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Не могат да бъдат инсталирани всички актуализации" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Сваляне на списъка с промени..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Проверка" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Размер за изтегляне: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Системата Ви е актуална" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Можете да инсталирате %s актуализация" msgstr[1] "Можете да инсталирате %s актуализации" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Моля, изчакайте! Това може да отнеме известно време." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Актуализацията е завършена" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Инсталиране на актуализациите" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Нова версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуция вече не се поддържа" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1005,17 +1011,17 @@ msgstr "" "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com " "за повече информация за надграждането!" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Индексът на софтуера е повреден" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1038,58 +1044,67 @@ msgstr "" "това в „Система” -> „Администрация” -> „Свойства на софтуера”" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Поддържане на системата в съвременно състояние" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Преглеждане на системата Ви\n" +"Грешка при сканиране на CD\n" "\n" -"Софтуерните актуализации поправят грешки, премахват уаизвими места в " -"сигурността и предлагат нови възможности." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Поддържане на системата в съвременно състояние" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Започване на надграждането?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Отмяна на _изтеглянето" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Провер_ка" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Проверка на софтуерните канали за нови актуализации" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Описание" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Бележки към изданието" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Показване напредъка на отделните файлове" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Актуализации на софтуера" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1097,32 +1112,37 @@ msgstr "" "Софтуерните актуализации поправят грешки, премахват уаизвими места в " "сигурността и предлагат нови възможности." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Надграждане" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Надграждане до последната версия на Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Проверка" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Поднови надграждането" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Скрий тази информация за в бъдеще" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Инсталиране на актуализациите" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1234,11 +1254,12 @@ msgid "_Install security updates without confirmation" msgstr "_Инсталирай актуализациите на сигурноста без потвърждение" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1272,10 +1293,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Добавете пълния APT ред за канала, който искате да добавитеUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Надграждане до Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 актуализации на сигурността" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Надграждане до последната версия на Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Не могат да бъдат инсталирани всички актуализации" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Преглеждане на системата Ви\n" +#~ "\n" +#~ "Софтуерните актуализации поправят грешки, премахват уаизвими места в " +#~ "сигурността и предлагат нови възможности." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Официално поддържан" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/bn.po b/po/bn.po index 110eeb8c..fee1579c 100644 --- a/po/bn.po +++ b/po/bn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" @@ -128,9 +128,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -146,55 +146,55 @@ msgstr "ডিস্কের জন্য একটি নাম দিন" msgid "Please insert a disc in the drive:" msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "ভাঙা প্যাকেজসমূহ" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "আপগ্রেড গণনা করতে পারছে না" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' ইন্সটল করা যাচ্ছে না" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -203,25 +203,25 @@ msgstr "" "রিপোর্ট করুন। " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "meta-package অনুমান করা যাচ্ছ না" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "আনতে ব্যর্থ" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -231,15 +231,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "ক্যাশ পড়া হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "কোন সঠিক মিরর পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "ডিফল্ট sources তৈরি করে?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "রিপোজিটরির তথ্য সঠিক নয়" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -294,22 +294,22 @@ msgstr "" "রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ " "হিসাবে রিপোর্ট করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "আপগ্রেড করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "আপনি কি আপগ্রেড শুরু করতে চান?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "আপগ্রেড ইন্সটল করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "আপগ্রেড ডাউনলোড করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -359,62 +359,67 @@ msgstr "" "আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া পরীক্ষা " "করুন এবং আবার চেষ্টা করুন। " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "এই ধাপটি এড়িয়ে যাও (_এ)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "সরাও (_স)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "প্রেরণ করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "সিস্টেমটি রিস্টার্ট করছি" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "ভুল প্যাকেজ তথ্য" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -424,19 +429,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "তথ্যের জন্য জিজ্ঞাসা" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "আপগ্রেড করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "সিস্টেম আপগ্রেড সম্পন্ন।" @@ -457,7 +462,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "%li of %li ফাইল ডাউনলোড করছে" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "%li মিিনিট বাকি আছে" @@ -487,23 +492,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "কনফিগারেশন ফাইল '%s'\n" "কি সরানো হবে?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "'diff' কমান্ডটি পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -513,28 +524,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s টি প্যাকেজ মোছা হবে।" msgstr[1] "%s টি প্যাকেজ মোছা হবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -542,37 +553,40 @@ msgid "" "You have to download a total of %s. " msgstr "আপনাকে সর্বমোট %s ডাউনলোড করতে হবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "কোন আপগ্রেড পাওয়া যায় নি" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "আপনার সিস্টেম আপ-টু-ডেট" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "%s মুছো" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s ইন্সটল" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s আপগ্রেড" @@ -606,11 +620,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "রিবুট করা প্রয়োজন" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?" @@ -641,11 +655,8 @@ msgid "Start the upgrade?" msgstr "আপগ্রেড শুরু করবো?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড করছি" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -765,9 +776,10 @@ msgid "Verfication failed" msgstr "যথার্থ্যতা পরীক্ষা করতে ব্যর্থ" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "আপগ্রেড যথার্থ্য হয়েছে কিনা তা পরীক্ষা করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা " "থাকতে পারে। " @@ -792,16 +804,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -809,151 +821,142 @@ msgid "" msgstr "" "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "আপডেট ইন্সটল করো (_I)" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" +msgid "Normal updates" +msgstr "আপডেট ইন্সটল করো (_I)" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "ভার্সন %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "পরীক্ষা করো (_C)" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "ডাউনলোড এর আকার: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "আপনার সিস্টেম আপ-টু-ডেট" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন" msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "আপডেট সম্পন্ন" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "আপডেট ইন্সটল করো (_I)" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "নতুন ভার্সন: %s (আকার: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "ভার্সন %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -969,85 +972,103 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:7 msgid "Keep your system up-to-date" msgstr "আপনার সিস্টেম আপ-টু-ডেট রাখুন" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" +msgstr "" +"সিডি স্ক্যানিং এ ত্রুটি\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "আপগ্রেড শুরু করবো?" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "ডাউনলোড বাতিল (_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "পরিবর্তন" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "পরীক্ষা করো (_k)" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "নতুন আপডেট এর জন্য সফ্টওয়্যার চ্যানেল পরীক্ষা করো" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "বর্ননা" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "রিলিজ নোট" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "একটি ফাইলের অগ্রগতি দেখাও" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "সফ্টওয়্যার আপডেট" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "আপগ্রেড (_p)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "পরীক্ষা করো (_C)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "পুনরায় আপগ্রেড শুরু (_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "ভবিষ্যতে এই তথ্য আড়াল রাখো (_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "পরিবর্তন" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1156,10 +1177,10 @@ msgstr "নিরাপত্তা জনিত আপডেট গুলো #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1186,10 +1207,10 @@ msgstr "ইউ-আর-আই:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1241,7 +1262,7 @@ msgstr "নতুন ডিস্ট্রিবিউশন রিলিজে #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1260,7 +1281,7 @@ msgstr "update-manager ডায়ালগের আকার সংরক্ষ #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1286,209 +1307,186 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "উবুন্টু ৫.১০ আপডেট" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "আপডেট ইন্সটল করো (_I)" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "অফিসিয়াল ভাবে সমর্থিত" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "অফিসিয়াল ভাবে সমর্থিত" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" @@ -1539,6 +1537,37 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Some software no longer officially supported" +#~ msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" + +#~ msgid "Could not find any upgrades" +#~ msgstr "কোন আপগ্রেড পাওয়া যায় নি" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।" + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড " +#~ "করছি" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" + +#~ msgid "Cannot install all available updates" +#~ msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "অফিসিয়াল ভাবে সমর্থিত" + #~ msgid "The following updates will be skipped:" #~ msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:" diff --git a/po/br.po b/po/br.po index 644917da..8b9e8dd9 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" @@ -133,7 +133,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -146,79 +146,79 @@ msgstr "Roit un anv evit ar bladenn marplij" msgid "Please insert a disc in the drive:" msgstr "Lakait ur bladenn e-barzh ul lenner marplij:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pakadoù torr" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -228,15 +228,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -335,72 +335,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -410,19 +415,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -442,7 +447,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -474,19 +479,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -496,28 +507,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -525,36 +536,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -588,11 +602,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -623,7 +637,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -744,8 +758,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -768,162 +782,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -939,84 +941,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1121,10 +1135,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1151,10 +1165,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1204,7 +1218,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1223,7 +1237,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1247,192 +1261,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/ca.po b/po/ca.po index cb40bdb5..1afba09e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" @@ -133,9 +133,9 @@ msgstr "" "programació." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "Introduïu un nom per al disc" msgid "Please insert a disc in the drive:" msgstr "Inseriu un disc a la unitat:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paquets trencats" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -163,24 +163,24 @@ 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:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, fuzzy msgid "Can't upgrade required meta-packages" msgstr "No s'han pogut actualitzar els metapaquets sol·licitats" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -189,11 +189,11 @@ msgstr "" "de l'error. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "No s'ha pogut instal·lar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,15 +217,16 @@ msgstr "" "els error. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -235,12 +236,12 @@ msgstr "" " Instal·leu algun dels paquets anteriors des del Synaptic o amb l'apt-get " "per poder continuar." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Ha fallat l'extracció" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -250,15 +251,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "S'està llegint la memòria cau" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -266,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "No s'ha trobat una rèplica vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -283,11 +284,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -296,11 +297,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "La informació del dipòsit no és vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -308,13 +309,14 @@ msgstr "" "En actualitzar la informació del dipòsit s'ha produït un error. Informeu de " "l'error." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "S'han desactivat les fonts de tercers" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -322,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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "S'ha produït un error en l'actualització" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -334,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "No disposeu de suficient espai al disc" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -351,15 +353,15 @@ msgstr "" "apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Voleu iniciar l'actualització?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "No s'han pogut instal·lar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -371,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "No s'han pogut descarregar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -383,66 +385,72 @@ 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:488 -msgid "Some software no longer officially supported" -msgstr "Algun programari ja no es mantindrà oficialment" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "els mantindrà la comunitat Ubuntu ('universe').\n" "\n" "Si no teniu activat 'universe' se us sugerirà que els desintal·leu. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Voleu esborrar els paquets obsolets?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Omet aquest pas" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "Esbo_rra" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "S'està restaurant l'estat original del sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "S'està comprovant el gestor de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "S'està actualitzant la informació del dipòsit" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "La informació del paquet no és valida" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -452,19 +460,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Actualitzant" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "S'està cercant programari obsolet" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "S'ha completat l'actualització del sistema" @@ -485,7 +493,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "S'està descarregant el fitxer %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Queden uns %li minuts" @@ -515,23 +523,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Voleu reemplaçar el fitxer de\n" "configuració '%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "No s'ha trobat l'ordre 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "S'ha produït un error greu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -541,28 +555,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "S'esborrarà %s paquet" msgstr[1] "S'esborraran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "S'instal·larà %s paquet" msgstr[1] "S'instal·laran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "S'actualitzarà %s paquet" msgstr[1] "S'actualitzaran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -570,7 +584,7 @@ msgid "" "You have to download a total of %s. " msgstr "Heu de descarregar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -579,32 +593,35 @@ msgstr "" "L'actualització pot durar algunes hores i no la podreu cancel·lar un cop " "hagi començat." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Per a evitar una possible pèrdua de dades, tanqueu tos els documents i " "aplicacions." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "No s'han pogut trobar actualitzacions" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "El vostre sistema està actualitzat" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "El vostre sistema ja està actualitzat" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Esborra %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instal·la %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Actualitza %s" @@ -638,11 +655,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "És necessari que reinicieu el sistema" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -679,11 +696,8 @@ msgid "Start the upgrade?" msgstr "Voleu iniciar l'actualització?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"S'està actualitzant a Ubuntu 6.06 " -"LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -805,8 +819,8 @@ msgstr "Ha fallat la verificació" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -829,16 +843,16 @@ msgstr "S'està descarregant el fitxer %li de %li amb %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "La llista de canvis encara no està disponible. Proveu-ho després." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "La llista de canvis encara no està disponible. Proveu-ho després." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -846,134 +860,125 @@ msgstr "" "S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió " "a Internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Debian Stable Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Instal·la les actualitzacions" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Actualitza a la darrera versió d'Ubuntu" +msgid "Normal updates" +msgstr "_Instal·la les actualitzacions" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Instal·la les actualitzacions" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "No es poden instal·lar les actualitzacions disponibles" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versió %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Comprova" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Mida de la descàrrega: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "El vostre sistema està actualitzat" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Espereu, això pot tardar una estona." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "S'estan comprovant les actualitzacions..." + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versió nova: %s (Mida: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versió %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "La vostra distribució ja no es mantindrà més" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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,17 +988,17 @@ msgstr "" "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més " "informació." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Ja disposeu de la nova distribució '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "L'índex de programari s'ha trencat" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1017,58 +1022,67 @@ msgstr "" "\"Propietats del programari\"" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Manteniu el vostre sistema actualitzat" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"S'està comprovant el vostre sistema\n" +"S'ha produït un error en llegir el CD\n" "\n" -"L'actualització del programari corregeix errors, elimina problemes de " -"seguretat i afegeix prestacions noves." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Manteniu el vostre sistema actualitzat" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Voleu iniciar l'actualització?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancel·la la _descàrrega" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Canvis" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Compro_va" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Comprova els canals de programari per a actualitzacions noves" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descripció" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notes de la versió" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Mostra el progrés per als fitxers individuals" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualitzacions de programari" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1076,32 +1090,37 @@ msgstr "" "Les actualitzacions de programari corregeixen errors, eliminen problemes de " "seguretat i proporcionen prestacions noves." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Actualitza" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualitza a la darrera versió d'Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Comprova" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Reprén l'actualització" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_En el futur oculta aquesta informació" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instal·la les actualitzacions" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Canvis" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1210,11 +1229,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instal·la actualitzacions de seguretat sense confirmació" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1248,10 +1268,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Introduïu la línia APT del canal que voleu afegir\n" @@ -1310,7 +1330,7 @@ msgstr "Comprova si hi ha noves distribucions" #: ../data/update-manager.schemas.in.h:3 #, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1331,7 +1351,7 @@ msgstr "Emmagatzema la mida del diàleg del gestor d'actualitzacions" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1357,213 +1377,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualitzacions d'Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Programari de la comunitat" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Paquets sense llicència lliure (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Programari amb restriccions d'exportació als EUA" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Debian Stable Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Instal·la les actualitzacions" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Paquets mantinguts oficialment (Main)" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualitzacions d'Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Paquets mantinguts oficialment (Main)" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Actualitzacions d'Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Algun programari ja no es mantindrà oficialment" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Paquets amb restriccions per copyright (Restricted)" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Actualitzacions d'Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" @@ -1616,6 +1613,48 @@ msgstr "Programari compatible DFSG amb dependències no lliures" msgid "Non-DFSG-compatible Software" msgstr "Programari no compatible DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Algun programari ja no es mantindrà oficialment" + +#~ msgid "Could not find any upgrades" +#~ msgstr "No s'han pogut trobar actualitzacions" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "El vostre sistema ja està actualitzat" + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "S'està actualitzant a Ubuntu 6.06 " +#~ "LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Debian Stable Security Updates" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Actualitza a la darrera versió d'Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "No es poden instal·lar les actualitzacions disponibles" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "S'està comprovant el vostre sistema\n" +#~ "\n" +#~ "L'actualització del programari corregeix errors, elimina problemes de " +#~ "seguretat i afegeix prestacions noves." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Paquets mantinguts oficialment (Main)" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1961,9 +2000,6 @@ msgstr "Programari no compatible DFSG" #~ msgid "Updating package list..." #~ msgstr "S'està actualitzant la llista de paquets..." -#~ msgid "Checking for updates..." -#~ msgstr "S'estan comprovant les actualitzacions..." - #~ msgid "Installing updates..." #~ msgstr "S'estan instal·lant les actualitzacions..." diff --git a/po/cs.po b/po/cs.po index a2efb624..5db4bad5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála \n" "Language-Team: Czech \n" @@ -129,9 +129,9 @@ 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 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Prosím zadejte jméno disku" msgid "Please insert a disc in the drive:" msgstr "Prosím vložte disk do mechaniky:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Poškozené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,23 +159,23 @@ 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:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nemohu aktualizovat požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nemohu vypočítat aktualizaci" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -184,11 +184,11 @@ msgstr "" "chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Chyba při ověření některých balíků" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nemohu nainstalovat '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,15 +211,16 @@ msgstr "" "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nemohu odhadnout meta-balík" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -228,12 +229,12 @@ msgstr "" " Před pokračováním si prosím nainstalujte si jeden z výše uvedených balíků " "pomocí synaptic nebo apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Chyba stahování" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -243,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Probíhá čtení cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nenalezeno správné zrcadlo" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -276,11 +277,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Vytvořit standardní zdroje?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -289,11 +290,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Neplatná informace zdroje" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -301,22 +302,22 @@ msgstr "" "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako " "chybu." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Zdroje třetích stran vypnuté" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Chyba během aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -324,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Nedostatek volného místa na disku" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -337,15 +338,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Chcete spustit aktualizaci?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nelze nainstalovat aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -358,11 +359,11 @@ msgstr "" "stavu. Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo " "Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nelze stáhnout aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -370,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:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Odebrat zastaralé balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Přeskočit tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Odebrat" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Chyba při zaznamenávání" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -408,26 +409,31 @@ msgstr "" "prohléhněte níže uvedenou zprávu. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Obnovuje se původní stav systému" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Kontroluje se manažer balíků" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aktualizují se informace o úložišti" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -437,19 +443,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Požaduje se potvrzení" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Probíhá upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Vyhledáván zastaralý software" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Upgrade systému je dokončen." @@ -470,7 +476,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Stahuji soubor %li z %li rychlostí %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Zhruba %li minut zbývá" @@ -500,23 +506,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Nahradit soubor s nastavením\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Příkaz \"diff\" nebyl nalezen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Nastala fatální chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -531,31 +543,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s balík bude odstraněn." msgstr[1] "%s balíky budou odstraněny." msgstr[2] "%s balíků bude odstraněno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nový balík bude nainstalován." msgstr[1] "%s nové balíky budou nainstalovány." msgstr[2] "%s nových balíků bude nainstalováno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s balík bude nahrazen vyšší verzí." msgstr[1] "%s balíky budou nahrazeny vyšší verzí." msgstr[2] "%s balíky bude nahrazeno vyšší verzí." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -563,37 +575,40 @@ msgid "" "You have to download a total of %s. " msgstr "Bude staženo celkem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Žádné upgrady nebyly nalezeny." +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Váš systém je aktuální" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Váš systém byl již upgradován." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Odstranit %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Nainstalovat %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Upgradovat %s" @@ -627,11 +642,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Vyžadován restartovat" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -667,10 +682,8 @@ msgid "Start the upgrade?" msgstr "Spustit upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Přechází se na Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -797,10 +810,13 @@ msgid "Verfication failed" msgstr "Ověření selhalo." #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" +"Stažení nástroje pro přechod na novou verzi systému se nepodařilo. " +"Pravděpodobně je problém se sítí. " #: ../UpdateManager/DistUpgradeFetcher.py:228 msgid "Authentication failed" @@ -822,115 +838,101 @@ msgstr "Stahuji %li. soubor z %li rychlostí %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Stahuji %li. soubor z %li neznámou rychlostí" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "Selhalo stažení seznamu změn. Prosím zkontrolujte své internetové připojení." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instaluji aktualizace" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Upgradovat na poslední verzi Ubuntu" +msgid "Normal updates" +msgstr "Instaluji aktualizace" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instaluji aktualizace" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nelze nainstalovat všechny dostupné aktualizace" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Verze %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Stahuji seznam změn ..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Zkontrolovat" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Stahovaná velikost: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Váš systém je aktuální" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -938,35 +940,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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Prosím čekejte, může to nějakou dobu trvat." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aktualizace je dokončena" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Zkontrolovat dostupné aktualizace" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nová verze: %s (Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verze %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Vaše distribude už není podporovaná" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -976,17 +983,17 @@ msgstr "" "Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na " "vyšší verzi se podívejte na http://www.ubuntu.com." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1006,58 +1013,67 @@ msgstr "" "v \"Systém\" -> \"Správa\" -> \"Vlastnosti Software\"" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Udržujte Váš systém aktuální" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Prozkoumává se systém\n" +"Chyba při načítání CD\n" "\n" -"Aktualizace softwaru opravují chyby, eliminují bezpečnostní zranitelnosti a " -"poskytují nové funkce." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Udržujte Váš systém aktuální" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Spustit upgrade?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Přerušit _stahování" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Změny" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Z_kontrolovat" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 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:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Popis" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Poznámky k vydáni" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Zobrazit průběh stahování jednotlivých souborů" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Aktualizace softwaru" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1065,32 +1081,37 @@ msgstr "" "Aktualizace softwaru opravuje chyby, eliminuje bezpečnostní zranitelnosti a " "poskytují nové vlastnosti." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgradovat na poslední verzi Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Zkontrolovat" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Pokračovat v upgradu" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Nezobrazovat příště tyto informace" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Na_instalovat Aktualizace" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Změny" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1201,11 +1222,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instalovat bezpečnostní aktualizace bez potvrzení" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1239,10 +1261,10 @@ msgstr "Adresa:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Zadejte úplný řádek pro cestu APT kanálu, který chcete přidatUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Přechází se na Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Upgradovat na poslední verzi Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nelze nainstalovat všechny dostupné aktualizace" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Prozkoumává se systém\n" +#~ "\n" +#~ "Aktualizace softwaru opravují chyby, eliminují bezpečnostní zranitelnosti " +#~ "a poskytují nové funkce." + +#~ msgid "Oficially supported" +#~ msgstr "Oficiálně podporované" + #~ msgid "The following updates will be skipped:" #~ msgstr "Následující aktualizace budou přeskočeny:" @@ -1694,8 +1733,5 @@ msgstr "Žádný DFSG kompatibilní Software" #~ msgid "Sections" #~ msgstr "Sekce" -#~ msgid "Check for available updates" -#~ msgstr "Zkontrolovat dostupné aktualizace" - #~ msgid "Sections:" #~ msgstr "Sekce:" diff --git a/po/da.po b/po/da.po index a8005f20..4c4bcea1 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K \n" "Language-Team: Danish \n" @@ -129,9 +129,9 @@ msgstr "" "Den valgte nøgle kunne ikke fjernes. Rapporter venligst dette som en fejl." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Indtast venligst et navn til disken" msgid "Please insert a disc in the drive:" msgstr "Indsæt venligst en disk i drevet:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Ødelagte pakker" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,25 +159,25 @@ 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:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke opgradere de krævede meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 #, 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 #, fuzzy msgid "Could not calculate the upgrade" msgstr "Kunne ikke udregne opgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,11 +186,11 @@ msgstr "" "Rapportér venligst dette som en fejl. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Fejl ved godkendelse af nogle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,16 +214,17 @@ msgstr "" "som en fejl. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 #, fuzzy msgid "Can't guess meta-package" msgstr "Kan ikke gætte meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -233,12 +234,12 @@ msgstr "" " Installer venligst en af pakkerne nævnt herover ved hjælp af Synaptic eller " "apt-get før du fortsætter." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Fejl ved hentning" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -248,15 +249,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Læser cache-mellemlager" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -281,11 +282,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -294,11 +295,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Arkivinformation ugyldig." -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -306,22 +307,22 @@ msgstr "" "Opgradering af arkivet resulterede i en ødelagt fil. raporter venligst dette " "som en fejl." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Trediepartskilder er fravalgt" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Fejl under opdatering" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -329,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Der er ikke nok fri diskplads" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -345,15 +346,15 @@ msgstr "" "køre 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Vil du starte opgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Kunne ikke installere opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -365,11 +366,11 @@ msgstr "" "Upgraderingen afbrydes nu. Dit system kan forekomme ustabilt. En oprydning " "blev foretaget (dpkg --configura -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Kunne ikke hente opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -377,17 +378,18 @@ msgstr "" "Opgraderingen afbryder nu. Tjek venligst din internetforbindelse eller dit " "installationsmedie og prøv igen. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Noget software er ikke længere officielt understøttet" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "kun understøttet af brugerne ('universe').↵\n" @@ -395,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:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Fjern forældede pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 #, fuzzy msgid "_Skip This Step" msgstr "_Spring dette trin over" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 #, fuzzy msgid "Error during commit" msgstr "Fejl under udførsel" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -422,26 +424,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Genstarter oprindelig systemtilstand" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Undersøger pakkehåndtering" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Opdaterer arkivinformation" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -451,19 +458,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Opgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Søger efter forældet software" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Systemopgradering er fuldført" @@ -484,7 +491,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Henter fil %li af %li fra %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Tid tilbage(ca.): %li minutter" @@ -514,23 +521,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Udskift opsætningsfilen\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Kommandoen 'diff' blev ikke fundet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "En alvorlig fejl opstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -545,28 +558,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pakke vil blive fjernet." msgstr[1] "%s pakker vil blive fjernet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s ny pakke vil blive installeret." msgstr[1] "%s nye pakker vil blive installeret." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakke vil blive opgraderet." msgstr[1] "%s pakker vil bliver opgraderet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -574,37 +587,40 @@ msgid "" "You have to download a total of %s. " msgstr "Der skal i alt hentes %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Opgraderingen kan tage flere timer og kan ikke fortrydes senere." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Kunne ikke finde nogen tilgængelige opgraderinger" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Dit system er opdateret" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Dit system er allerede opgraderet." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Fjern %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Opgrader %s" @@ -638,11 +654,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Genstart af maskinen er påkrævet" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -679,10 +695,8 @@ msgid "Start the upgrade?" msgstr "Start opgraderinegn?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Opgraderer til Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -808,9 +822,10 @@ msgid "Verfication failed" msgstr "Efterprøvning fejlede" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Efterprøvning af opgraderingen fejlede. Det er muligvis en fejl i netværket " "eller på serveren. " @@ -837,16 +852,16 @@ msgstr "Henter fil %li af %li med %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Henter fil %li af %li med ukendt hastighed" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -855,134 +870,125 @@ msgstr "" "Fejl ved hentning af ændringslisten. Undersøg venligst din " "internetforbindelse." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Installer Opdateringer" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Opgrader til seneste version af Ubuntu" +msgid "Normal updates" +msgstr "_Installer Opdateringer" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Installer Opdateringer" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Kan ikke installere alle tilgængelige opdateringer" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Henter listen med ændringer..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Tjek" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Overføringsstørelse: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Dit system er opdateret" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Vent venligst, dette kan tage et stykke tid." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Opdatering udført" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Installer Opdateringer" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Din distribution understøtes ikke længere" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -992,17 +998,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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Software indexet er i stykker" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1027,58 +1033,71 @@ msgstr "" "Properties\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:7 msgid "Keep your system up-to-date" msgstr "Hold dit system opdateret" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" +msgstr "" +"Fejl ved scanning af CD\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Start opgraderinegn?" + +#: ../data/glade/UpdateManager.glade.h:7 #, fuzzy msgid "Cancel _Download" msgstr "Afbryd _Hentning" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Ændringer" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 #, fuzzy msgid "Chec_k" msgstr "_Tjek" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 #, fuzzy msgid "Check the software channels for new updates" msgstr "Undersøg softwarekanalerne for nye opdateringer" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 #, fuzzy msgid "Release Notes" msgstr "Udgivelsesnoter" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Vis fremgang for enkelte filer" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Opdateringer" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1086,32 +1105,37 @@ msgstr "" "Softwareopdateringer retter fejl, lukker sikkerhedshuller og gør nye " "funktioner tilgængelige." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Opgrader" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Opgrader til seneste version af Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Tjek" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Genoptag opgradering" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Skjul denne information for fremtiden" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Installer Opdateringer" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Ændringer" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1226,10 +1250,10 @@ msgstr "_Installer sikkerhedsopdateringer automatisk uden bekræftelse" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 #, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1263,10 +1287,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1324,7 +1348,7 @@ msgstr "Undersøg om der er en ny distributionsudgivelse" #: ../data/update-manager.schemas.in.h:3 #, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1348,7 +1372,7 @@ msgstr "Gemmer størrelsen på opdateringshåndteringens dialog" #: ../data/update-manager.schemas.in.h:7 #, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Gemmer tilstanden for udfolderen der indeholder listen med ændringer og " @@ -1377,215 +1401,192 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Opdateringer" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Ikke frit programmel (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ikke frit programmel (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ikke frit programmel (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Installer Opdateringer" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Officielt understøttet" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Officielt understøttet" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ikke frit programmel (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Noget software er ikke længere officielt understøttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 #, fuzzy msgid "Restricted copyright" msgstr "Begrænset copyright" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1636,6 +1637,37 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Noget software er ikke længere officielt understøttet" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Kunne ikke finde nogen tilgængelige opgraderinger" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Dit system er allerede opgraderet." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Opgraderer til Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Opgrader til seneste version af Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Kan ikke installere alle tilgængelige opdateringer" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officielt understøttet" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/de.po b/po/de.po index e679473a..d4200608 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" @@ -135,9 +135,9 @@ msgstr "" "hierfür einen Fehlerbericht." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -153,11 +153,11 @@ msgstr "Geben Sie einen Namen für das Medium ein" msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie ein Medium in das Laufwerk:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Defekte Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -166,23 +166,23 @@ msgstr "" "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor " "Sie fortfahren." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Die Aktualisierung konnte nicht berechnet werden" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -191,11 +191,11 @@ msgstr "" "erstellen Sie hierfür einen Fehlerbericht. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "›%s‹ kann nicht installiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -220,15 +220,16 @@ msgstr "" "Sie hierfür einen Fehlerbericht. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Metapaket konnte nicht bestimmt werden" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -238,12 +239,12 @@ msgstr "" " Bitte installieren Sie eines der obigen Pakete über Synaptic oder apt-get, " "bevor Sie fortfahren." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Herunterladen ist fehlgeschlagen" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -253,15 +254,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Zwischenspeicher wird ausgelesen" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +270,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Kein gültiger Mirror gefunden" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -293,11 +294,11 @@ msgstr "" "Wenn Sie 'Nein' wählen, wird das Update abgebrochen." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Standardquellen generieren?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -311,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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Ungültige Kanalinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -323,13 +324,14 @@ msgstr "" "Die Aktualisierung der Quellen-Information ergab eine ungültige Datei. Bitte " "erstellen Sie einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Quellen von Drittanbietern deaktiviert" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -337,11 +339,11 @@ msgstr "" "Sie können diese nach dem Upgrade mit dem 'software-properties'-Werkzeug " "oder mit Synaptic reaktivieren." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Fehler während der Aktualisierung" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -350,11 +352,11 @@ msgstr "" "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre " "Netzwerkverbindung und versuchen Sie es noch einmal." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Unzureichender freier Festplattenspeicher" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -366,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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Möchten Sie die Aktualisierung starten?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Die Aktualisierungen konnten nicht installiert werden" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -387,11 +389,11 @@ msgstr "" "unbenutzbaren Zustand befinden. Eine Wiederherstellung wurde durchgeführt " "(dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -400,17 +402,18 @@ msgstr "" "Internet-Verbindung oder Ihr Installationsmedium und versuchen Sie es noch " "einmal. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "werden jetzt nur mehr von der Gemeinschaft unterstützt ('universe').\n" @@ -418,23 +421,23 @@ msgstr "" "Wenn sie 'universe' nicht aktiviert haben, werden diese Pakete im nächsten " "Schritt zum Entfernen vorgeschlagen. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Veraltete Pakete entfernen?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "Ü_berspringen" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Entfernen" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Fehler beim Anwenden" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -443,26 +446,31 @@ msgstr "" "Nachricht für nähere Informationen. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Wiederherstellen des alten Systemzustandes" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Paketverwaltung wird überprüft" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aktualisiere Quellen-Information" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Ungültige Paketinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -476,19 +484,19 @@ msgstr "" "Dies deutet auf einen gravierenden Fehler hin, bitte erstellen Sie hierfür " "einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Nach Bestätigung fragen" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Aktualisiere" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Nach veralteter Software wird gesucht" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Aktualisierung ist abgeschlossen." @@ -509,7 +517,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Lade Datei %li von %li mit %s/s herunter" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Ungefähr %li Minute(n) verbleibend" @@ -539,23 +547,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Die Konfigurationsdatei\n" "»%s« ersetzen?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Das 'diff'-Kommando konnte nicht gefunden werden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ein fataler Fehler ist aufgetreten" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -571,28 +585,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s Paket wird entfernt." msgstr[1] "%s Pakete werden entfernt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s neues Paket wird installiert." msgstr[1] "%s neue Pakete werden installiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s Paket wird aktualisiert." msgstr[1] "%s Pakete werden aktualisiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -600,7 +614,7 @@ msgid "" "You have to download a total of %s. " msgstr "Insgesamt müssen %s heruntergeladen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -609,32 +623,35 @@ msgstr "" "Die Aktualisierung kann mehrere Stunden dauern und zu keiner Zeit mehr " "abgebrochen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Um Datenverlust zu vermeiden, schließen Sie alle offenen Anwendungen und " "Dokumente." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Es liegen keine Aktualisierungen vor" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Ihr System ist auf dem aktuellen Stand" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Ihr System wurde bereits aktualisiert." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "%s wird entfernt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s wird installiert" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s wird aktualisiert" @@ -668,11 +685,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Neustart erforderlich" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -710,11 +727,8 @@ msgid "Start the upgrade?" msgstr "Mit der Aktualisierung beginnen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Auf Ubuntu 6.06 LTS aktualisieren" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -842,9 +856,10 @@ msgid "Verfication failed" msgstr "Verifikation fehlgeschlagen" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Die Prüfung der Aktualisierung ist fehlgeschlagen. Möglicherweise gibt es " "Probleme im Netzwerk oder am Server. " @@ -871,20 +886,20 @@ msgstr "Datei %li von %li wird mit %s/s heruntergeladen" msgid "Downloading file %li of %li with unknown speed" msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen " "Sie es zu einem späteren Zeitpunkt erneut." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen " "Sie es zu einem späteren Zeitpunkt erneut." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -892,134 +907,125 @@ msgstr "" "Die Liste mit Änderungen konnte nicht heruntergeladen werden. Bitte " "überprüfen Sie Ihre Internet-Verbindung." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Aktualisierungen werden installiert" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Aus die neueste Version von Ubuntu aktualisieren" +msgid "Normal updates" +msgstr "Aktualisierungen werden installiert" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Aktualisierungen werden installiert" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Liste mit Änderungen wird heruntergeladen..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Prüfen" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Download-Größe: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Ihr System ist auf dem aktuellen Stand" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aktualisierung ist abgeschlossen" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Nach verfügbaren Aktualisierungen suchen" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Neue Version: %s (Größe: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Ihre Distribution wird nicht länger unterstützt" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -1030,17 +1036,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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Neue Version '%s' der Distribution ist freigegeben" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Der Software-Index ist beschädigt" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1064,58 +1070,67 @@ msgstr "" "\" -> \"Software Eigenschaften\" ändern." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Halten Sie Ihr System aktuell" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Ihr System wird überprüft\n" +"Fehler beim Lesen der CD\n" "\n" -"Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " -"stellen neue Funktionen bereit." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Halten Sie Ihr System aktuell" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Mit der Aktualisierung beginnen?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "_Herunterladen abbrechen" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Änderungen" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Prüfen" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Software-Kanäle auf Aktualisierungen prüfen" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beschreibung" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Freigabemitteilung" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Fortschritt der einzelnen Dateien anzeigen" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software-Aktualisierungen" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1123,32 +1138,37 @@ msgstr "" "Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " "stellen neue Funktionen bereit." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Aktualisieren" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aus die neueste Version von Ubuntu aktualisieren" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Prüfen" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Aktualisierung fortsetzen" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Diese Information in Zukunft _nicht mehr anzeigen" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Aktualisierungen _installieren" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Änderungen" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1262,11 +1282,12 @@ msgid "_Install security updates without confirmation" msgstr "Sicherheitsaktualisierungen _ohne Bestätigung installieren" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1300,10 +1321,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Geben Sie die vollständige APT-Zeile für den Kanal ein, den sie " @@ -1363,8 +1384,9 @@ msgid "Check for new distribution releases" msgstr "Auf neue Versionen der Distribution prüfen" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1385,8 +1407,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Speichert die Größe des Fensters der Aktualisierungsverwaltung" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Speichert den Zustand des Expanders, der die Liste der Änderungen und die " @@ -1414,212 +1437,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Aktualisierungen" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Contributed Software" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Unfrei (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Unfrei (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Software mit US-Exportbeschränkungen" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Aktualisierungen werden installiert" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Offiziell unterstützt" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Offiziell unterstützt" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Unfrei (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Urheberrechtlich eingeschränkt" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1670,6 +1671,47 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Es liegen keine Aktualisierungen vor" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Ihr System wurde bereits aktualisiert." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Auf Ubuntu 6.06 LTS aktualisieren" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Aus die neueste Version von Ubuntu aktualisieren" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Ihr System wird überprüft\n" +#~ "\n" +#~ "Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " +#~ "stellen neue Funktionen bereit." + +#~ msgid "Oficially supported" +#~ msgstr "Offiziell unterstützt" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1828,9 +1870,6 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "Sections" #~ msgstr "Sparten:" -#~ msgid "Check for available updates" -#~ msgstr "Nach verfügbaren Aktualisierungen suchen" - #~ msgid "Sections:" #~ msgstr "Sparten:" diff --git a/po/el.po b/po/el.po index 2d55ab71..959500fb 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -130,9 +130,9 @@ msgstr "" "σφάλμα." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκ msgid "Please insert a disc in the drive:" msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Κατεστραμμένα πακέτα" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,23 +161,23 @@ msgstr "" "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή apt-" "get για να συνεχίσετε." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,11 +186,11 @@ msgstr "" "Παρακαλώ αναφέρετε το ως σφάλμα. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,15 +214,16 @@ msgstr "" "ως σφάλμα. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -232,12 +233,12 @@ msgstr "" "Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν να " "συνεχίσετε." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Αποτυχία λήψης" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -247,15 +248,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Ανάγνωση λανθάνουσας μνήμης" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -288,11 +289,11 @@ msgstr "" " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Δημιουργία προεπιλεγμένων πηγών;" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -306,11 +307,11 @@ msgstr "" "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε " "'Όχι' η ενημέρωση θα ακυρωθεί." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Μη έγκυρες πληροφορίες repository" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -318,13 +319,14 @@ msgstr "" "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο " "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Απενεργοποιήθηκαν πηγές τρίτων" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -332,11 +334,11 @@ msgstr "" "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-" "properties' ή με το synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Σφάλμα κατά την ενημέρωση" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -344,11 +346,11 @@ msgstr "" "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει " "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -360,15 +362,15 @@ msgstr "" "προηγούμενων εγκαταστάσεων με την εντολή 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -380,11 +382,11 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. " "Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Αδυναμία λήψης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -392,17 +394,18 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Αυτά τα εγκατεστημένα πακέτα δεν υποστηρίζονται πια επίσημα, και τώρα " "ανήκουν στο community-supported ('universe').\n" @@ -410,23 +413,23 @@ msgstr "" "Αν δεν έχετε ενεργοποιημένο το 'universe' , θα γίνει πρόταση για απομάκρυνση " "αυτών των πακέτων στο επόμενο βήμα. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Αφαίρεση παρωχημένων πακέτων;" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "Παράκα_μψη αυτου του βήματος" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Απομάκρυνση" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Σφάλμα κατά την υποβολή" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,26 +438,31 @@ msgstr "" "παρακάτω μήνυμα για περισσότερες πληροφορίες. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Έλεγχος διαχειριστή πακέτων" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Ενημέρωση πληροφοριών repository" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Μη έγκυρες πληροφορίες πακέτου" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +475,19 @@ msgstr "" "απαραίτητο πακέτο '%s'.\n" " Αυτό σημαίνει ότι πρόκειται για σημαντικό σφάλμα, παρακαλώ αναφέρετε το." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Ερώτηση για επιβεβαίωση" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Γίνεται αναβάθμιση" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε." @@ -500,7 +508,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Λήψη αρχείου %li από %li με %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Απομένουν περίπου %li λεπτά" @@ -530,23 +538,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Αντικατάσταση αρχείου ρύθμισης\n" "'%s';" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Η εντολή 'diff' δεν βρέθηκε" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Προέκυψε μοιραίο σφάλμα" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -562,28 +576,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί." msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s νέο πακέτο πρόκειται να εγκατασταθεί." msgstr[1] "%s νέο πακέτα πρόκειται να εγκατασταθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί." msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -591,7 +605,7 @@ msgid "" "You have to download a total of %s. " msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -600,32 +614,35 @@ msgstr "" "Η αναβάθμιση μπορεί να διαρκέσει αρκετές ώρες και δεν είναι δυνατή η ακύρωση " "της αργότερα." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και " "έγγραφα." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Δεν βρέθηκαν αναβαθμίσεις" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Το σύστημα σας είναι ενημερωμένο" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Απομάκρυνση %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Εγκατάσταση %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Αναβάθμιση %s" @@ -659,11 +676,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Απαιτείται επανεκκίνηση" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -701,10 +718,8 @@ msgid "Start the upgrade?" msgstr "Έναρξη της αναβάθμισης;" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Αναβάθμιση σε Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -828,9 +843,10 @@ msgid "Verfication failed" msgstr "Αποτυχία επαλήθευσης" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Η επαλήθευση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή " "εξυπηρετητή. " @@ -857,18 +873,18 @@ msgstr "Λήψη αρχείου %li από %li με %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -876,134 +892,125 @@ msgstr "" "Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Εγκατάσταση ενημερώσεων" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" +msgid "Normal updates" +msgstr "Εγκατάσταση ενημερώσεων" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Εγκατάσταση ενημερώσεων" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Έκδοση%s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Λήψη της λίστας των αλλαγών..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Έλε_γχος" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Μέγεθος λήψης: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Το σύστημα σας είναι ενημερωμένο" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση" msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Η ενημέρωση ολοκληρώθηκε" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Έλεγχος για διαθέσιμες ενημερώσεις" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Νέα έκδοση: %s (Μέγεθος: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Έκδοση%s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Η διανομή σας δεν υποστηρίζεται πια" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1021,17 @@ msgstr "" "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες " "για την αναβάθμιση." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Είναι διαθέσιμη νέα έκδοση διανομής '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,58 +1055,67 @@ msgstr "" "συστήματος\" -> \"Ιδιότητες λογισμικού\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Διατηρήστε το σύστημα σας ενημερωμένο" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Γίνεται ανάλυση του συστήματος σας\n" +"Σφάλμα ελέγχου του CD\n" "\n" -"Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " -"να παρέχουν νέες λειτουργίες." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Διατηρήστε το σύστημα σας ενημερωμένο" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Έναρξη της αναβάθμισης;" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Ακύρωση _λήψης αρχείων" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Αλλαγές" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Ελε_γχος" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Έλεγχος των καναλιών λογισμικού για ενημερώσεις" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Περιγραφή" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Σημειώσεις έκδοσης" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Εμφάνιση προόδου μοναδικών αρχείων" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Αναβαθμίσεις λογισμικού" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1107,32 +1123,37 @@ msgstr "" "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " "να παρέχουν νέες λειτουργίες." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "Ανα_βάθμιση" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Έλε_γχος" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Συνέχεια αναβάθμισης" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Απόκρυ_ψη αυτής της πληροφορίας στο μέλλον" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Ε_γκατάσταση ενημερώσεων" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Αλλαγές" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1242,11 +1263,12 @@ msgid "_Install security updates without confirmation" msgstr "Ε_γκατάσταση ενημερώσεων ασφαλείας χωρίς επιβεβαίωση" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1281,10 +1303,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Εισάγετε την πλήρη γραμμή APT του καναλιού που θέλετε να " @@ -1342,8 +1364,9 @@ msgid "Check for new distribution releases" msgstr "Έλεγχος για νέες εκδόσεις της διανομής" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1363,8 +1386,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Αποθηκεύει το μέγεθος του διαλόγου του update-manager" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Αποθηκεύει τη κατάσταση του expander που περιέχει τη λίστα των αλλαγών και " @@ -1392,211 +1416,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Όχι-ελεύθερα (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Όχι-ελεύθερα (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Εγκατάσταση ενημερώσεων" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Με επίσημη υποστήριξη" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" -msgstr "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Με επίσημη υποστήριξη" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Περιορισμένα πνευματικά δικαιώματα" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1647,6 +1649,47 @@ msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Δεν βρέθηκαν αναβαθμίσεις" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Αναβάθμιση σε Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Γίνεται ανάλυση του συστήματος σας\n" +#~ "\n" +#~ "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας " +#~ "και να παρέχουν νέες λειτουργίες." + +#~ msgid "Oficially supported" +#~ msgstr "Oficially supported" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1755,9 +1798,6 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgid "Sections" #~ msgstr "Ενότητες" -#~ msgid "Check for available updates" -#~ msgstr "Έλεγχος για διαθέσιμες ενημερώσεις" - #~ msgid "Sections:" #~ msgstr "Ενότητες:" diff --git a/po/en_AU.po b/po/en_AU.po index 9d153fcb..54dd3f08 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-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons \n" "Language-Team: English (Australia) \n" @@ -129,9 +129,9 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Please enter a name for the disc" msgid "Please insert a disc in the drive:" msgstr "Please insert a disc in the drive:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Broken packages" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,23 +159,23 @@ 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:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Can't upgrade required meta-packages" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -184,11 +184,11 @@ msgstr "" "this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,15 +212,16 @@ msgstr "" "bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Can't guess meta-packag" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Failed to fetch" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Reading cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +286,11 @@ msgstr "" "If you select 'no' the update will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -302,11 +303,11 @@ msgstr "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -314,13 +315,14 @@ msgstr "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -328,11 +330,11 @@ msgstr "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Error during update" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -340,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Not enough free disk space" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -356,15 +358,15 @@ msgstr "" "'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Could not install the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -376,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Could not download the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -388,17 +390,18 @@ msgstr "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "only community-supported ('universe').\n" @@ -406,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:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Remove obsolete packages?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Skip This Step" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Remove" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Error during commit" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -431,26 +434,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Restoring original system state" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Checking package manager" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Updating repository information" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -463,19 +471,19 @@ msgstr "" "not be found anymore.\n" "This indicates a serious error, please report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Asking for confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Upgrading" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Searching for obsolete software" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "System upgrade is complete." @@ -496,7 +504,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Downloading file %li of %li at %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "About %li minutes remaining" @@ -526,24 +534,30 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Replace configuration file\n" "\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "The 'diff' command was not found" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "A fatal error occured" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -558,28 +572,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s package is going to be removed." msgstr[1] "%s packages are going to be removed." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s new package is going to be installed." msgstr[1] "%s new packages are going to be installed." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s package is going to be upgraded." msgstr[1] "%s packages are going to be upgraded." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -587,7 +601,7 @@ msgid "" "You have to download a total of %s. " msgstr "You have to download a total of %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -595,30 +609,33 @@ msgid "" msgstr "" "The upgrade can take several hours and cannot be canceled at any time later." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Your system is up-to-date" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Remove %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Install %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" @@ -652,11 +669,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Reboot required" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -693,10 +710,8 @@ msgid "Start the upgrade?" msgstr "Start the upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Upgrading to Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -819,9 +834,10 @@ msgid "Verfication failed" msgstr "Verfication failed" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -848,16 +864,16 @@ msgstr "Downloading file %li of %li with %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Downloading file %li of %li with unknown speed" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "The list of changes is not available yet. Please try again later." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "The list of changes is not available yet. Please try again later." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -865,134 +881,125 @@ msgstr "" "Failed to download the list of changes. Please check your Internet " "connection." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Install Updates" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Upgrade to the latest version of Ubuntu" +msgid "Normal updates" +msgstr "_Install Updates" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Install Updates" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Cannot install all available updates" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Downloading the list of changes..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Check" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Download size: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Your system is up-to-date" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Install Updates" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "New version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Your distribution is not supported anymore" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -1002,17 +1009,17 @@ msgstr "" "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "New distribution release '%s' is available" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,59 +1043,67 @@ msgstr "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Keep your system up-to-date" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Examining your system\n" -"\n" +"Error scaning the CD\n" "\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Start the upgrade?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancel _Download" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Chec_k" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Check the software channels for new updates" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Release Notes" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Show progress of single files" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1096,32 +1111,37 @@ msgstr "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade to the latest version of Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Check" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Resume Upgrade" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Hide this information in the future" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Install Updates" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1231,11 +1251,12 @@ msgid "_Install security updates without confirmation" msgstr "_Install security updates without confirmation" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1271,10 +1292,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Enter the complete APT line of the channel that you want to addUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Upgrading to Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Security Updates" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Upgrade to the latest version of Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Cannot install all available updates" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Examining your system\n" +#~ "\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officially supported" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/en_CA.po b/po/en_CA.po index decd0e07..b7a59cf9 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-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -134,7 +134,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,33 +147,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -206,24 +206,24 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -233,15 +233,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -341,73 +341,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -417,20 +422,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -450,7 +455,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -483,19 +488,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -505,28 +516,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -534,37 +545,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "Your system has broken packages!" +msgid "Your system is up-to-date" +msgstr "Your system is up-to-date!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -598,11 +612,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -633,7 +647,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -760,8 +774,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -785,16 +799,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "There is a new release of Ubuntu available!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -803,153 +817,143 @@ msgstr "" "Failed to download changes. Please check if there is an active internet " "connection." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.04 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Install" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "_Install" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Install" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Cancel downloading the ChangeLog" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Your system is up-to-date!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Install" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -965,87 +969,100 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "Upgrade finished" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Upgrade finished" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "_Install" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1158,10 +1175,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1190,10 +1207,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Enter the complete APT line of the repository that you want to add\n" "Language-Team: \n" @@ -133,7 +133,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -146,33 +146,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -205,24 +205,24 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -232,15 +232,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -340,73 +340,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -416,21 +421,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 #, fuzzy msgid "Asking for confirmation" msgstr "Checking system configuration" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -450,7 +455,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -483,19 +488,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -505,28 +516,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -534,37 +545,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "Your system has broken packages!" +msgid "Your system is up-to-date" +msgstr "Your system is up-to-date!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -598,11 +612,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -633,7 +647,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -759,8 +773,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -784,16 +798,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "There is a new release of Ubuntu available!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -802,153 +816,143 @@ msgstr "" "Failed to download changes. Please check if there is an active internet " "connection." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installing updates..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Installing updates..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installing updates..." -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Downloading Changes" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Your system is up-to-date!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Installing updates..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -964,86 +968,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Installing updates..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1158,10 +1174,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1190,10 +1206,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Enter the complete APT line of the repository that you want to add\n" "Language-Team: Spanish \n" @@ -136,9 +136,9 @@ msgstr "" "como un fallo." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -154,11 +154,11 @@ msgstr "Por favor, introduzca un nombre para el disco" msgid "Please insert a disc in the drive:" msgstr "Por favor, inserte un disco en la unidad:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paquetes rotos" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -167,23 +167,23 @@ msgstr "" "software. Por favor, arréglelos primero usando Synaptic o apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "No se han podido actualizar los meta-paquetes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Error autenticando algunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -220,15 +220,16 @@ msgstr "" "como un fallo. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "No se ha podido determinar el meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -238,12 +239,12 @@ msgstr "" " Por favor, instale uno de los paquetes anteriores usando Synaptic o apt-get " "antes de proceder." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Error al descargar" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -253,15 +254,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Leyendo caché" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +270,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "No se ha encontrado un servidor espejo válido" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -294,11 +295,11 @@ msgstr "" "Si selecciona «No» se cancelará la actualización." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "¿Generar orígenes predeterminados?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -312,11 +313,11 @@ msgstr "" "¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se " "cancelará la actualización." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Información de repositorio no válida" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -324,13 +325,14 @@ 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:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Orígenes de terceros desactivados" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -338,11 +340,11 @@ msgstr "" "volver a activarlas tras la actualización con la herramienta «Propiedades " "del software», o con Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Error durante la actualización" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -351,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "No hay espacio suficiente en el disco" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -367,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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "¿Desea comenzar la actualización?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "No se han podido instalar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -388,11 +390,11 @@ msgstr "" "estado inutilizable. Se está llevando a cabo una recuperación (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "No se han podido descargar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -400,17 +402,18 @@ 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:488 -msgid "Some software no longer officially supported" -msgstr "Algunos programas ya no están soportados oficialmente" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "sólo están soportados por la comunidad («universe»).\n" @@ -418,23 +421,23 @@ msgstr "" "Si no tiene activado el «universe», se le sugerirá que desinstale estos " "paquetes en el siguiente paso. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "¿Desinstalar los paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Saltar este paso" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Quitar" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Error durante la confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -443,26 +446,31 @@ msgstr "" "inferior para más información. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Restaurando el estado original del sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Comprobando gestor de paquetes" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Actualizando la información del repositorio" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Información de paquete no válida" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -475,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:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Solicitando confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Actualizando" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Buscando paquetes obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "La actualización del sistema se ha completado." @@ -508,7 +516,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Descargando archivo %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Faltan %li minutos" @@ -538,23 +546,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "¿Desea reemplazar el archivo de configuración\n" "«%s»?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "No se ha encontrado el comando «diff»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ha ocurrido un error fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -570,28 +584,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Se va a desinstalar %s paquete." msgstr[1] "Se van a desinstalar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Se va a instalar %s paquete nuevo." msgstr[1] "Se van a instalar %s paquetes nuevos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "Se va a actualizar %s paquete." msgstr[1] "Se van a actualizar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -599,7 +613,7 @@ msgid "" "You have to download a total of %s. " msgstr "Debe descargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -608,32 +622,35 @@ msgstr "" "La actualización puede durar varias horas, y no podrá ser cancelada después " "en ningún momento." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir la pérdida de datos, cierre todas las aplicaciones y " "documentos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "No se ha podido encontrar ninguna actualización" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Su sistema está actualizado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Su sistema ya ha sido actualizado." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Desinstalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" @@ -667,11 +684,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Se requiere reiniciar el equipo" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -708,10 +725,8 @@ msgid "Start the upgrade?" msgstr "¿Comenzar la actualización?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Actualizando a Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -839,9 +854,10 @@ msgid "Verfication failed" msgstr "Error de verificación" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Ha fallado la verificación de la actualización. Puede haber un problema con " "la red o el servidor. " @@ -868,20 +884,20 @@ msgstr "Descargando archivo %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Descargando archivo %li de %li a velocidad desconocida" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo " "más tarde." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo " "más tarde." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -889,134 +905,125 @@ msgstr "" "Hubo un fallo al descargar la lista de cambios. Por favor, compruebe su " "conexión a Internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instalando actualizaciones" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Actualizar a la última versión de Ubuntu" +msgid "Normal updates" +msgstr "Instalando actualizaciones" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instalando actualizaciones" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "No se han podido instalar todas las actualizaciones disponibles" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Descargando la lista de cambios..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Comprobar" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Tamaño de descarga: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Su sistema está actualizado" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Por favor, espere; esto puede tardar un poco." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "La actualización se ha completado" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Comprobar las actualizaciones disponibles" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nueva versión: %s (Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Su distribución ya no está soportada" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -1026,17 +1033,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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Está disponible la nueva versión «%s» de la distribución" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "El índice de software está dañado" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1060,58 +1067,67 @@ msgstr "" "software»." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Mantenga su sistema actualizado" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Analizando su sistema\n" +"Error explorando el CD\n" "\n" -"Las actualizaciones de software corrigen errores, eliminan fallos de " -"seguridad y proporcionan nuevas funcionalidades." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Mantenga su sistema actualizado" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "¿Comenzar la actualización?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancelar _descarga" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Comprobar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Comprobar si hay nuevas actualizaciones en los canales de software" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descripción" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de publicación" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Mostrar el progreso de cada archivo individual" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualizaciones de software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1119,32 +1135,37 @@ msgstr "" "Las actualizaciones de software corrigen errores, eliminan fallos de " "seguridad y proporcionan nuevas funcionalidades." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "A_ctualizar" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualizar a la última versión de Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Comprobar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Continuar actualización" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Ocultar esta información en el futuro" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instalar actualizaciones" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1255,11 +1276,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instalar actualizaciones de seguridad sin requerir confirmación" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1294,10 +1316,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Introduzca la línea de APT completa del canal que quiera añadirUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Actualizando a Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Actualizaciones de seguridad de Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Actualizar a la última versión de Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "No se han podido instalar todas las actualizaciones disponibles" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Analizando su sistema\n" +#~ "\n" +#~ "Las actualizaciones de software corrigen errores, eliminan fallos de " +#~ "seguridad y proporcionan nuevas funcionalidades." + +#~ msgid "Oficially supported" +#~ msgstr "Soportado oficialmente" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1777,9 +1820,6 @@ msgstr "Software no compatible con la DFSG" #~ msgid "Sections" #~ msgstr "Secciones" -#~ msgid "Check for available updates" -#~ msgstr "Comprobar las actualizaciones disponibles" - #~ msgid "Sections:" #~ msgstr "Secciones:" diff --git a/po/fi.po b/po/fi.po index 959956f5..8f7740c6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -133,7 +133,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -149,11 +149,11 @@ msgstr "Syötä nimi levylle" msgid "Please insert a disc in the drive:" msgstr "Aseta levy asemaan:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Rikkinäisiä paketteja" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,23 +162,23 @@ msgstr "" "ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen " "jatkamista." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Ei voida päivittää tarvittavia metapaketteja" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -187,11 +187,11 @@ msgstr "" "korjata. Ilmoita tästä virheraportilla. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Joitain paketteja todennettaessa tapahtui virhe" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Ei voitu asentaa pakettia \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,15 +214,16 @@ msgstr "" "Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Ei voitu arvata metapakettia" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -232,12 +233,12 @@ msgstr "" "Asenna jokin luetelluista paketeista synapticilla tai apt-get-ohjelmalla " "ennen jatkamista." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Ei voitu noutaa" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -247,15 +248,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Luetaan kätköä" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Ei löytynyt sopivaa palvelinta" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -288,11 +289,11 @@ msgstr "" "Jos valitset \"Ei\", päivitys keskeytyy." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Luo ja ota käyttöön oletusohjelmalähteet?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -305,11 +306,11 @@ msgstr "" "Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys " "keskeytyy." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Virhe ohjelmavarastotiedoissa" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -317,13 +318,14 @@ msgstr "" "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita " "tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -331,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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Virhe päivitettäessä" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -343,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Levytilaa ei ole riittävästi" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +361,15 @@ msgstr "" "komentoa 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Haluatko aloittaaa päivityksen?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Ei voitu asentaa päivityksiä" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,11 +381,11 @@ msgstr "" "Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. " "Korjaustoimenpiteet suoritettiin (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Päivityksiä ei voitu noutaa" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -391,17 +393,18 @@ msgstr "" "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. " "CD) toiminta ja yritä uudelleen. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "ylläpitämiä ('universe'-ohjelmat).\n" @@ -409,23 +412,23 @@ msgstr "" "Jos sinulla ei ole 'universe'-ohjelmakanavaa otettuna käyttöön, nämä paketit " "suositellaan poistettaviksi seuraavassa kohdassa. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Poista vanhentuneet paketit?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Ohita tämä kohta" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Poista" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Virhe suoritettaesa" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,26 +437,31 @@ msgstr "" "lisätietoja. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Palautetaan alkuperäistä järjestelmän tilaa" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Tarkistetaan pakettienhallintaa" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Päivitetään ohjelmavarastotietoja" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Pakettitiedot viallisia" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -466,19 +474,19 @@ msgstr "" "enää löydetty.\n" "Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Pyydetään vahvistusta" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Päivitetään" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Etsitään vanhetuneita ohjelmia" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Järjestelmän päivitys on valmis." @@ -499,7 +507,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Noin %li minuuttia jäljellä" @@ -529,23 +537,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Korvataanko asetustiedosto\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Komentoa 'diff' ei löytynyt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Vakava virhe tapahtui" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -558,28 +572,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paketti poistetaan" msgstr[1] "%s pakettia poistetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s uusi paketti asennetaan" msgstr[1] "%s uutta pakettia asennetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paketti päivitetään" msgstr[1] "%s pakettia päivitetään" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -587,7 +601,7 @@ msgid "" "You have to download a total of %s. " msgstr "Noudettavaa yhteensä %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -595,31 +609,34 @@ msgid "" msgstr "" "Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Päivityksiä ei löytynyt" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Järjestelmäsi on ajan tasalla" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Järjestelmäsi on jo päivitetty." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Poista %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Asenna %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Päivitä %s" @@ -653,11 +670,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Uudellenkäynnistys vaaditaan" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -695,11 +712,8 @@ msgid "Start the upgrade?" msgstr "Aloita päivitys?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Päivitetään jakeluun: Ubuntu 6.06 " -"LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -824,9 +838,10 @@ msgid "Verfication failed" msgstr "Tarkistus epäonnistui" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Päivityksen tarkistaminen epäonnistui. Tämä voi johtua ongelmasta " "verkkoyhteydessä tai palvelimessa. " @@ -853,151 +868,142 @@ msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Asennetaan päivityksiä" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Päivitä Ubuntun viimeisimpään versioon" +msgid "Normal updates" +msgstr "Asennetaan päivityksiä" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Asennetaan päivityksiä" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versio: %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Noudetaan muutosluetteloa..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Tarkista" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 #, fuzzy msgid "None" msgstr "Ei-vapaa" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "%s täytyy noutaa" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Järjestelmäsi on ajan tasalla" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Odota, tämä voi kestää jonkun aikaa." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Päivitys on valmis" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Tarkista saatavilla olevat päivitykset" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Uusi versio: %s (koko: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versio: %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Jakeluasi ei enää tueta" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1007,17 +1013,17 @@ msgstr "" "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja " "päivittämisestä osoitteesta http://www.ubuntu.com/" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Uusi jakelujulkaisu \"%s\" on saatavilla" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Ohjelmaluettelo on rikkinäinen" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1040,58 +1046,67 @@ msgstr "" "\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Pidä järjestelmäsi ajan tasalla" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Tarkistetaan järjestelmää\n" +"Virhe luettaessa CD-levyä\n" "\n" -"Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia " -"ominaisuuksia." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Pidä järjestelmäsi ajan tasalla" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Aloita päivitys?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Peruuta _nouto" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Muutokset" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Tarkista" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Tarkista onko ohjelmakanavissa uusia päivityksiä" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Kuvaus" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Julkaisutiedot" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Näytä edistyminen yksittäisten tiedostojen osalta" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Ohjelmapäivitykset" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1099,32 +1114,37 @@ msgstr "" "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia " "ominaisuuksia." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Päivitä" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Päivitä Ubuntun viimeisimpään versioon" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Tarkista" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Jatka päivitystä" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "P_iilota tämä tieto jatkossa" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Asenna päivitykset" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Muutokset" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1235,11 +1255,12 @@ msgid "_Install security updates without confirmation" msgstr "_Asenna turvallisuuspäivitykset kysymättä" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1273,10 +1294,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Kirjoita haluamasi kanavan koko APT-rivi\n" @@ -1335,8 +1356,9 @@ msgid "Check for new distribution releases" msgstr "Tarkista onko uusia julkaisuja jakelusta" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1357,8 +1379,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Tallentaa päivitystenhallintaikkunan koon" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Tallentaa muutosluettelon ja kuvauksen näyttämän ikkunalaajennoksen tilan." @@ -1385,212 +1408,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 päivitykset" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Muiden tarjoamat ohjelmat" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ei-vapaat ohjelmat (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "USA:sta vientirajoitetut ohjelmat" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 turvallisuuspäivitykset" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Asennetaan päivityksiä" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Virallisesti tuettu" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Virallisesti tuettu" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Rajoitettu tekijänoikeus" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" @@ -1642,6 +1643,47 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmat" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Päivityksiä ei löytynyt" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Järjestelmäsi on jo päivitetty." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Päivitetään jakeluun: Ubuntu 6.06 " +#~ "LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 turvallisuuspäivitykset" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Päivitä Ubuntun viimeisimpään versioon" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Tarkistetaan järjestelmää\n" +#~ "\n" +#~ "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat " +#~ "uusia ominaisuuksia." + +#~ msgid "Oficially supported" +#~ msgstr "Virallisesti tuettu" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1757,21 +1799,9 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "Remove obsolete Packages?" #~ msgstr "Poista vanhentuneet paketit?" -#~ msgid "Check for available updates" -#~ msgstr "Tarkista saatavilla olevat päivitykset" - #~ msgid "Sections:" #~ msgstr "Osastot:" -#~ msgid "" -#~ "Error scanning the CD\n" -#~ "\n" -#~ "%s" -#~ msgstr "" -#~ "Virhe luettaessa CD-levyä\n" -#~ "\n" -#~ "%s" - #~ msgid "Add Software Channels" #~ msgstr "Lisää ohjelmistokanavia" diff --git a/po/fr.po b/po/fr.po index 6847a205..eae025fe 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" @@ -134,9 +134,9 @@ msgstr "" "ce bogue." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -152,11 +152,11 @@ msgstr "Veuillez saisir un nom pour le disque" msgid "Please insert a disc in the drive:" msgstr "Veuillez insérer un disque dans le lecteur :" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paquets défectueux" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -165,23 +165,23 @@ msgstr "" "ce logiciel. Veuillez d'abord les réparer à l'aide de Synaptic ou d'apt-get " "avant de continuer." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Les meta-paquets désirés n'ont pu être mis à jour" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossible de calculer la mise à jour" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -190,11 +190,11 @@ msgstr "" "rapporter ce bogue. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installer « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -218,15 +218,16 @@ msgstr "" "rapporter ce bogue. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -236,12 +237,12 @@ msgstr "" " Veuillez d'abord installer l'un des paquets ci-dessus, en utilisant " "Synaptic ou apt-get, avant de continuer." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Impossible d'établir la connexion" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -251,15 +252,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Lecture du cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +268,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Aucun mirroir valide n'a pu être trouvé" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -292,11 +293,11 @@ msgstr "" "Sinon, la mise à jour sera annulée." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Générer les sources par défaut ?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -310,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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informations sur le dépôt invalides" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -322,13 +323,14 @@ msgstr "" "La mise à jour des informations du dépôt a créé un fichier invalide. Merci " "de rapporter ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Sources provenant de tiers désactivées" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -336,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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Erreur lors de la mise à jour" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -349,11 +351,11 @@ msgstr "" "un problème de réseau. Veuillez vérifier votre connexion au réseau et " "réessayer." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Il n'y a pas assez d'espace libre sur le disque" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -366,15 +368,15 @@ msgstr "" "get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Voulez-vous commencer la mise à jour ?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Les mises à jour n'ont pu être installées" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -386,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Les mises à jour n'ont pu être téléchargées" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -398,17 +400,18 @@ msgstr "" "Abandon de la mise à jour. Veuillez vérifier votre connexion Internet ou " "votre médium d'installation puis réessayez. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Certains logiciels ne sont plus supportés officiellement" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "maintenant seulement supportées par la communauté ('universe').\n" @@ -416,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:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Enlever les paquets obsolètes ?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Passer cette étape" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Supprimer" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Erreur pendant la soumission" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -441,26 +444,31 @@ msgstr "" "ci-dessous pour plus d'informations. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Restaurer le système dans son état d'origine" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Vérification du gestionnaire de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Mise à jour des informations sur les dépôts en cours" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Information sur les paquet invalides" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -474,19 +482,19 @@ msgstr "" "Ceci est indique qu'une erreur important s'est produite, veuillez rapporter " "ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Demande de confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Mise à jour en cours" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Recherche de logiciels obsolètes" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "La mise à jour du système est terminée." @@ -507,7 +515,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Téléchargement du fichier %li sur %li à %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Environ %li minutes restantes" @@ -537,23 +545,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Remplacer le fichier de configuration\n" "« %s » ?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "La commande « diff » n'a pu être trouvée" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Une erreur fatale est survenue" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -569,28 +583,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Le paquet %s va être supprimé." msgstr[1] "Les paquets %s vont être supprimés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Le paquet %s va être installé." msgstr[1] "Les paquets %s vont être installés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "Le paquet %s va être mis à jour." msgstr[1] "Les paquets %s vont être mis à jour." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -598,7 +612,7 @@ msgid "" "You have to download a total of %s. " msgstr "Vous devez télécharger un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -607,32 +621,35 @@ msgstr "" "La mise à jour peut prendre plusieurs heures et ne peut être annulée " "ultérieurement." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pour éviter toute perte de données accidentelle, veuillez fermer toutes les " "applications et documents ouverts." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Aucune mise à jour n'est disponible" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Votre système est à jour" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Votre système a déjà été mis à jour." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Supprimer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Mettre à jour %s" @@ -666,11 +683,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Redémarrage de l'ordinateur requis" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -708,11 +725,8 @@ msgid "Start the upgrade?" msgstr "Démarrer la mise à jour ?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Mise à jour vers Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -838,9 +852,10 @@ msgid "Verfication failed" msgstr "Échec de la vérification" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "La vérification de la mise à jour à échoué. Il y a peut-être un problème " "avec le réseau ou avec le serveur. " @@ -867,20 +882,20 @@ msgstr "Téléchargement du fichier %li sur %li à %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "La liste des modifications n'est pas encore disponible. Veuillez réessayer " "plus tard." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "La liste des modifications n'est pas encore disponible. Veuillez réessayer " "plus tard." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -888,134 +903,125 @@ msgstr "" "Échec du téléchargement de la liste des modifications. Veuillez vérifier que " "votre connexion Internet est activée." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installation des mises à jour" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" +msgid "Normal updates" +msgstr "Installation des mises à jour" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installation des mises à jour" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Impossible d'installer toutes les mises à jour disponibles" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Téléchargement de la liste des nouveautés…" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Vérifier" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Taille du téléchargement : %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Votre système est à jour" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Veuillez patienter, cela peut prendre du temps." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "La mise à jour est terminée" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Rechercher les mises à jour disponibles" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nouvelle version : %s (taille : %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Votre distribution n'est plus supportée" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1031,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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Une nouvelle version « %s » est disponible" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "La liste des logiciels est corrompue" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1060,58 +1066,67 @@ msgstr "" "Gestionnaire de canaux logiciels »" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Maintenir votre système à jour" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Recherche de mises à jour pour votre système\n" +"Erreur lors de l'analyse du CD\n" "\n" -"Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " -"problèmes de sécurité et apporter de nouvelles fonctionalités." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Maintenir votre système à jour" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Démarrer la mise à jour ?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "_Annuler le téléchargement" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changements" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Vérifier" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Vérifier les canaux logiciels pour de nouvelles mises à jour" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notes de publication" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Afficher l'avancement des fichiers individuels" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Mises à jour des logiciels" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1119,32 +1134,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:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "Mettre à _jour" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 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:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Vérifier" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Reprendre la mise à jour" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Masquer ces informations à l'avenir" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Installer les mises à jour" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Changements" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1257,11 +1277,12 @@ msgid "_Install security updates without confirmation" msgstr "_Installer les mises à jour de sécurité sans confirmation" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1297,10 +1318,10 @@ msgstr "URI :" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Saisissez la ligne APT complète du canal logiciel que vous souhaitez " @@ -1360,8 +1381,9 @@ msgid "Check for new distribution releases" msgstr "Vérifier les nouvelles versions de la distribution" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1382,8 +1404,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Enregistre la taille de la fenêtre du gestionnaire de mises à jour" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Enregistre l'état de développement de la liste des changements et des " @@ -1411,212 +1434,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Mises à jour pour Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Maintenu par la communauté (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Logiciel contribué" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu Dapper Drake 6.06" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Maintenu par la communauté (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Maintenu par la communauté (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Logiciel restreint à l'export (USA)" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu Dapper Drake 6.06" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Mises à jour de sécurité pour Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Installation des mises à jour" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu Breezy Badger 5.10" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Supportés officiellement" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu Breezy Badger 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "« Backports » pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Mises à jour de sécurité" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Mises à jour de sécurité" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" -msgstr "Supporté officiellement" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Supportés officiellement" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "« Backports » pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu Breezy Badger 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Maintenu par la communauté (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-libre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Certains logiciels ne sont plus supportés officiellement" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restreint" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Mises à jour de sécurité" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "« Backports » pour Ubuntu 5.10" @@ -1669,6 +1670,47 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Certains logiciels ne sont plus supportés officiellement" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Aucune mise à jour n'est disponible" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Votre système a déjà été mis à jour." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Mise à jour vers Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Mises à jour de sécurité pour Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Impossible d'installer toutes les mises à jour disponibles" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Recherche de mises à jour pour votre système\n" +#~ "\n" +#~ "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " +#~ "problèmes de sécurité et apporter de nouvelles fonctionalités." + +#~ msgid "Oficially supported" +#~ msgstr "Supporté officiellement" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1779,9 +1821,6 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "Sections" #~ msgstr "Catégories :" -#~ msgid "Check for available updates" -#~ msgstr "Rechercher les mises à jour disponibles" - #~ msgid "Sections:" #~ msgstr "Sections :" diff --git a/po/fur.po b/po/fur.po index 32880a22..20068c18 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz \n" "Language-Team: Friulian \n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -438,7 +443,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -470,19 +475,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -492,28 +503,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -521,36 +532,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -584,11 +598,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -619,7 +633,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -740,8 +754,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -764,162 +778,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -935,84 +937,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1116,10 +1130,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1146,10 +1160,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1199,7 +1213,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1218,7 +1232,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1242,192 +1256,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/gl.po b/po/gl.po index 5d4b8dc1..6eb5c6e7 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -137,7 +137,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -150,33 +150,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,23 +185,23 @@ msgstr "" "erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -211,24 +211,24 @@ msgstr "" "erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -238,15 +238,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Erro ao quitar a clave" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -346,73 +346,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Xa hai outro xestor de paquetes en execución" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -422,20 +427,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Actualización rematada" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -455,7 +460,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -488,19 +493,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -510,28 +521,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -539,36 +550,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "O seu sistema está actualizado!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -602,11 +617,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -637,7 +652,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -764,8 +779,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -789,16 +804,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Hai unha versión nova de Ubuntu dispoñible!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -807,154 +822,143 @@ msgstr "" "Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión " "activa." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Instalando actualizacións..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "Comprobando se hai actualizacións..." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Descargando cambios" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "O seu sistema está actualizado!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Instalando actualizacións..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "A súa distribución xa non está soportada" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -970,86 +974,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrición" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualizacións de software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Instalando actualizacións..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1163,10 +1179,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1195,10 +1211,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Introduza a liña completa do repositorio APT que quere engadir\n" "Language-Team: Hebrew \n" @@ -134,9 +134,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -152,11 +152,11 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "אנא הכניסו תקליטור לכונן:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "חבילות פגומות" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,69 +164,75 @@ msgstr "" "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן " "באמצעות synaptic או apt-get לפני שתמשיך." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "חבילה חיונית תוסר בלית ברירה" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 +#, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +"לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n" +"כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "לא ניתן להתקין את \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" +"במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן " +"באמצעות synaptic או apt-get לפני שתמשיך." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -236,15 +242,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +258,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -269,11 +275,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -282,32 +288,32 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "שגיאה במהלך העדכון" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -315,11 +321,11 @@ msgstr "" "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת " "שלכם ונסו שנית." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "אין מספיק שטח בדיסק הקשיח" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -328,15 +334,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "האם ברצונך להתחיל את השדרוג?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "לא ניתן להתקין את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -345,74 +351,79 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "לא ניתן להוריד את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" "השדרוג בוטל. אנא בדקו את החיבור לאינטרנט או את מדיית ההתקנה ונסו שנית. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_דלג על השלב" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_הסר" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "מאתחל את המערכת" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -424,19 +435,19 @@ msgstr "" "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n" "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "משדרג" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "שדרוג המערכת הושלם." @@ -457,7 +468,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה." #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "נותרו %li דקות." @@ -490,19 +501,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -512,28 +529,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." -msgstr[0] "" -msgstr[1] "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." +msgstr[0] "חבילה %s תשודרג." +msgstr[1] "%s חבילות ישודרגו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "חבילה חדשה %s תותקן." msgstr[1] "%s חבילות חדשות יותקנו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "חבילה %s תשודרג." msgstr[1] "%s חבילות ישודרגו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -541,37 +558,41 @@ msgid "" "You have to download a total of %s. " msgstr "יש להוריד %s בסה\"כ." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "השדרוג עשוי לקחת מספר שעות, ולא ניתן לבטלו בשלב מאוחר יותר." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית או מסמך פתוחים." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "לא ניתן למצוא שדרוג זמין" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "המערכת שלך מעודכנת!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "המערכת כבר שודרגה." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "הסר %s " -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "התקן %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "שדרג %s" @@ -605,11 +626,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -640,7 +661,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -764,10 +785,11 @@ msgid "Verfication failed" msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " -msgstr "" +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " +msgstr "אימות השדרוג נכשל. עלולה להיות בעיה עם הרשת או עם השרת. " #: ../UpdateManager/DistUpgradeFetcher.py:228 msgid "Authentication failed" @@ -789,171 +811,160 @@ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" msgid "Downloading file %li of %li with unknown speed" msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "גרסה חדשה של אובונטו זמינה!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "עדכוני אבטחה - אובונטו 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "משדרג את אובונטו" +msgid "Normal updates" +msgstr "מתקין עדכונים..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "לא ניתן להתקין את כל העדכונים הזמינים" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "גרסה %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "מוריד שינוייים" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "המערכת שלך מעודכנת!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "מתקין עדכונים..." msgstr[1] "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 #, fuzzy msgid "Update is complete" msgstr "ההורדה הושלמה" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "מתקין עדכונים..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "גרסה %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "ההפצה שלך כבר לא נתמכת, סליחה." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -969,86 +980,107 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" +"שגיאה בסריקת התקליטור\n" +"\n" +"%s" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "" +"שגיאה בסריקת התקליטור\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "שינויים" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "תיאור" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "עדכוני תוכנה" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_המשך בשידרוג" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "מתקין עדכונים..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "שינויים" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1163,10 +1195,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1195,10 +1227,10 @@ msgstr "כתובת:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "הכנס את שורת APT השלמה של המאגר שברצונך להוסיף\n" @@ -1258,7 +1290,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1277,7 +1309,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1302,217 +1334,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "עדכונים - אובונטו 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "תוכנה שנתרמה" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "לא-חופשי (Multiverse(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "לא-חופשי (Multiverse(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "תוכנה מוגבלת בארה\"ב" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "עדכוני אבטחה - אובונטו 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "מתקין עדכונים..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "נתמך רשמית" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "נתמך רשמית" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "לא-חופשי (Multiverse(" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "נתמך רשמית" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "זכויות יוצרים מגבילות" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "עדכונים - אובונטו 5.10" @@ -1566,6 +1575,27 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Could not find any upgrades" +#~ msgstr "לא ניתן למצוא שדרוג זמין" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "המערכת כבר שודרגה." + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "עדכוני אבטחה - אובונטו 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "משדרג את אובונטו" + +#~ msgid "Cannot install all available updates" +#~ msgstr "לא ניתן להתקין את כל העדכונים הזמינים" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "נתמך רשמית" + #~ msgid "About %li seconds remaining" #~ msgstr "נותרו %li שניות." diff --git a/po/hi.po b/po/hi.po index 0a14e9f3..7f13d7fd 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Hindi \n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -438,7 +443,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -470,19 +475,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -492,28 +503,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -521,36 +532,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -584,11 +598,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -619,7 +633,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -740,8 +754,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -764,162 +778,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -935,84 +937,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1116,10 +1130,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1146,10 +1160,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1199,7 +1213,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1218,7 +1232,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1242,192 +1256,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/hr.po b/po/hr.po index 255a4694..bfd689eb 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" @@ -130,9 +130,9 @@ msgstr "" "Ključ koji ste odabrali se ne može obrisati. Molimo prijavite ovu grešku." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Upišite ime za disk" msgid "Please insert a disc in the drive:" msgstr "Ubacite CD u uređaj:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pokvareni paketi" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ 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:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Ne mogu nadograditi potrebne meta-pakete" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nisam mogao riješiti nadogradnju" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "prijavite ovo kao grešku. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Greška prilikom identificiranja nekih paketa" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Ne mogu instalirati '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -213,15 +213,16 @@ msgstr "" "grešku. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nisam mogao odrediti meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" " Prije nastavljanja, molim instalirajte jedan od gore navedenih paketa " "koristeći synaptic ili apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Preuzimanje nije uspjelo" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Čitam spremnik" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nisam našao ispravan zrcalni poslužitelj" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +286,11 @@ msgstr "" "Ako odaberete 'ne' nadogradnja će se prekinuti." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Kreirati uobičajene izvore?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -302,11 +303,11 @@ msgstr "" "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja će " "prekinuti." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Podaci repozitorija neispravni" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -314,13 +315,14 @@ msgstr "" "Nadogradnja podataka repozitorija je rezultirala neispravnom datotekom. " "Molim, prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Izvori trećih strana su isključeni" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -328,11 +330,11 @@ msgstr "" "ih uključiti nakon nadogradnje sa 'software-properties' alatom ili sa " "synapticom." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Greška prilikom nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -340,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Nema dovoljno praznog mjesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -356,15 +358,15 @@ msgstr "" "koristeći 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Želite li pokrenuti nadogradnju?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nisam mogao instalirati nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -376,11 +378,11 @@ msgstr "" "Nadogradnja se prekida. Vaš sistem bi mogao biti u neupotrebljivom stanju. " "Obnavljanje je pokrenuto (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nisam mogao preuzeti nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -388,17 +390,18 @@ msgstr "" "Nadogradnja se prekida. Molim provjerite vašu internet vezu ili " "instalacijski medij i pokušajte ponovo. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Neki paketi više nisu službeno podržani" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "repozitoriju kojeg održava zajednica ('Universe').\n" @@ -406,23 +409,23 @@ msgstr "" "Ako nemate omogućen 'universe' repozitorij, ovi paketi biti će predloženi za " "uklanjanje. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Ukloniti zastarjele pakete?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Preskoči ovaj korak" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Ukloni" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Greška prilikom čina" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -431,26 +434,31 @@ msgstr "" "više informacija. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Vraćam u početno stanje" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Provjeravam upravitelja paketima" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Nadograđujem podatke repozitorija" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Neispravni podaci paketa" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -463,19 +471,19 @@ msgstr "" "naći.\n" "Ovo upućuje na ozbiljnu grešku, molim prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Pitam za potvrdu" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Nadograđujem" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Tražim zastarjele programe" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Nadogradnja sustava je završena." @@ -496,7 +504,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Preuzimam datoteku %li od %li pri %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Otprilike je ostalo %li minuta" @@ -526,23 +534,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Zamijeniti konfiguracijsku datoteku\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Nisam našao naredbu 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Pojavila se ozbiljna greška" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -558,31 +572,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket će biti uklonjen." msgstr[1] "%s paketa će biti uklonjena." msgstr[2] "%s paketa će biti uklonjeno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s novi paket će biti instaliran." msgstr[1] "%s nova paketa će biti instalirana." msgstr[2] "%s novih paketa će biti instalirano." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket će biti nadograđen." msgstr[1] "%s paketa će biti nadograđena." msgstr[2] "%s paketa će biti nadograđeno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -590,7 +604,7 @@ msgid "" "You have to download a total of %s. " msgstr "Morate preuzeti ukupno %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -599,30 +613,33 @@ msgstr "" "Nadogradnja može potrajati nekoliko sati i ne može biti prekinuta niti u " "jednom trenutku." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nisam mogao naći niti jednu nadogradnju" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Vaš sustav sadrži posljednje nadogradnje" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Vaš sustav je već nadograđen." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Ukloni %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instaliraj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Nadogradi %s" @@ -656,11 +673,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Potrebno je ponovno pokretanje računala" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -699,10 +716,8 @@ msgid "Start the upgrade?" msgstr "Pokrenuti nadogradnju?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Nadograđujem na Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -826,9 +841,10 @@ msgid "Verfication failed" msgstr "Provjera nije uspjela" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Provjera nadogradnje nije uspjela. Vjerovatno je problem u mreži ili sa " "poslužiteljem. " @@ -855,18 +871,18 @@ msgstr "Preuzimam datoteku %li od %li pri %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -874,99 +890,85 @@ msgstr "" "Preuzimanje popisa promjena nije uspjelo. Molim, provjerite svoju internet " "vezu." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Instaliraj nadogradnje" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Nadogradi na zadnju verziju Ubuntua" +msgid "Normal updates" +msgstr "_Instaliraj nadogradnje" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Instaliraj nadogradnje" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Ne mogu instalirati sve dostupne nadogradnje" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Verzija %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Preuzimam popis promjena..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Pro_vjeri" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Veličina preuzimanja: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Vaš sustav sadrži posljednje nadogradnje" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -974,35 +976,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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Instaliraj nadogradnje" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nova verzija: %s (Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verzija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Vaša distibucija više nije podržana" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1019,17 @@ msgstr "" "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više " "detalja o nadogradnji." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Popis programa je oštećen" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,58 +1052,67 @@ msgstr "" "ovo ponašanje u \"Sustav\" -> \"Administacija\" -> \"Postavke nadogradnje\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Održavajte vaš sustav nadograđenim" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Ispitujem vaš sustav\n" +"Greška prilikom očitavanja CD-a\n" "\n" -"Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " -"donose nove mogućnosti." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Održavajte vaš sustav nadograđenim" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Pokrenuti nadogradnju?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Prekini _preuzimanje" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Promjene" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "P_rovjeri" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Provjeri repozitorije za nove nadogradnje" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Opis" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Bilješke izdanja" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Prikaži napredak pojedinih datoteka" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Nadogradnje programa" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1104,32 +1120,37 @@ msgstr "" "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " "donose nove mogućnosti." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "Na_dogradnja" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Nadogradi na zadnju verziju Ubuntua" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Pro_vjeri" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Nastavi nadogradnju" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Ubuduće _sakrij ovu informaciju" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instaliraj nadogradnje" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Promjene" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1239,11 +1260,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instaliraj sigurnosne nadogradnje bez potvrde" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1277,10 +1299,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Unesite kompletnu APT liniju repozitorija koji želite dodatiUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Nadograđujem na Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 sigurnosne nadogradnje" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Nadogradi na zadnju verziju Ubuntua" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Ne mogu instalirati sve dostupne nadogradnje" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Ispitujem vaš sustav\n" +#~ "\n" +#~ "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " +#~ "donose nove mogućnosti." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Službeno podržani" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/hu.po b/po/hu.po index 4e4bda92..7667e36b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -129,9 +129,9 @@ msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem, jelentse ezt hibaként." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Kérem, adja meg a lemez nevét" msgid "Please insert a disc in the drive:" msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Törött csomagok" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ 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:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "A szükséges meta-csomagok nem frissíthetőek" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nem tudom megtervezni a frissítés menetét" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "jelentse ezt hibaként. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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,27 +199,28 @@ 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' nem telepíthető" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 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:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nem tudom megállapítani a meta-csomagot" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -229,12 +230,12 @@ msgstr "" " Kérem, előbb telepítse a fenti csomagok egyikét a synaptic vagy az apt-get " "használatával." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "A letöltés meghiúsult" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -244,15 +245,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Gyorsítótár beolvasása" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +261,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "nem található érvényes tükör" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +286,11 @@ msgstr "" "A \"Nem\" kiválasztása megszakítja a frissítést." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Alapértelmezett források ismételt előállítása?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Érvénytelen csomagtároló információ" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,13 +316,14 @@ msgstr "" "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, " "jelentse ezt hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "A külső források letiltva" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -329,11 +331,11 @@ msgstr "" "a frissítés után a Szoftvertulajdonságok eszközzel, vagy a Synaptic " "csomagkezelővel." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Hiba történt a frissítés közben" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -341,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Nincs elég szabad hely a merevlemezen" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Biztosan el szeretné kezdeni a frissítést?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "A frissítések nem telepíthetők" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "A frissítések nem tölthetők le" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,17 +391,18 @@ 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:488 -msgid "Some software no longer officially supported" -msgstr "Néhány szoftver már nincs hivatalosan támogatva" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "közösség által (\"universe\").\n" @@ -407,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:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Eltávolítja az elavult csomagokat?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "Ezen lé_pés kihagyása" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Eltávolítás" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Hiba a módosítások rögzítése közben" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -432,26 +435,31 @@ msgstr "" "információkat tartalmaz a hibára vonatkozóan. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "A rendszer eredeti állapotának helyreállítása" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Csomagkezelő ellenőrzése" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Csomagtároló információ frissítése" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Érvénytelen csomaginformációk" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -464,19 +472,19 @@ msgstr "" "található többé.\n" "Ez egy komoly problémát jelez, jelentse hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Megerősítés kérése" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Frissítés folyamatban" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Elavult szoftverek keresése" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "A rendszer frissítése befejeződött." @@ -497,7 +505,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Kb. %li perc van hátra" @@ -527,24 +535,30 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Lecseréli a(z)\n" "\"%s\"\n" "konfigurációs fájlt?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "A 'diff' parancs nem található" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Végzetes hiba történt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -560,25 +574,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s csomag el lesz távolítva." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s új csomag kerül telepítésre." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s csomag frissítve lesz." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -586,7 +600,7 @@ msgid "" "You have to download a total of %s. " msgstr "Összes letöltendő adatmennyiség: %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -595,32 +609,35 @@ msgstr "" "A frissítés több órát is igénybe vehet és a későbbiek során nem lehet " "bármikor megszakítani." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott " "alkalmazást és dokumentumot." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nincs elérhető frissítés" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "A rendszere naprakész" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Az Ön rendszere már frissítve lett." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "%s eltávolítása" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s telepítése" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s frissítése" @@ -654,11 +671,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Újraindítás szükséges" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -695,11 +712,8 @@ msgid "Start the upgrade?" msgstr "Megkezdi a frissítést?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Frissítés az Ubuntu 6.06 LTS " -"változatra" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -824,9 +838,10 @@ msgid "Verfication failed" msgstr "Az ellenőrzés meghiúsult" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "A frissítés ellenőrzése meghiúsult. Probléma lehet a hálózattal vagy a " "kiszolgálóval. " @@ -853,16 +868,16 @@ msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp" msgid "Downloading file %li of %li with unknown speed" msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "A módosítások listája még nem érhető el. Próbálkozzon később." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "A módosítások listája még nem érhető el. Próbálkozzon később." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -870,133 +885,124 @@ msgstr "" "A módosítások listájának letöltése meghiúsult. Ellenőrizze az " "internetkapcsolatát." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 biztonsági frissítések" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Telepítés" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Frissítés az Ubuntu legújabb változatára" +msgid "Normal updates" +msgstr "_Telepítés" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Telepítés" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nem telepíthető minden rendelkezésre álló frissítés" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "%s verzió: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Módosítások listájának letöltése..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Ellenőrzés" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Letöltés mérete: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "A rendszere naprakész" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Kis türelmet, ez eltarthat egy ideig." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "A frissítés befejeződött" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Telepítés" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Új verzió: %s (Méret: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "%s verzió: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "A terjesztés már nem támogatott" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1006,17 +1012,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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "A disztribúció új \"%s\" kiadása elérhető" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "A szoftverindex sérült" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,58 +1047,67 @@ msgstr "" "menüpont alatt változtathatja meg." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Tartsa naprakészen a rendszerét" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"A rendszer elemzése\n" +"Hiba történt a CD beolvasása közben\n" "\n" -"A szoftverfrissítések programhibákat javítanak, megszüntetik a biztonsági " -"sebezhetőségeket és új szolgáltatásokat biztosítanak." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Tartsa naprakészen a rendszerét" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Megkezdi a frissítést?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Letöltés _megszakítása" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Módosítások" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Ellenőrzés" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Frissítések keresése a szoftvercsatornákon" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Leírás" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Kiadási megjegyzések" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Egyes fájlok állapotának mutatása" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Szoftverfrissítések" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1100,32 +1115,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:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Frissítés" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Frissítés az Ubuntu legújabb változatára" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Ellenőrzés" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Frissítés _folytatása" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_A jövőben ne mutassa ezt az információt" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Telepítés" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Módosítások" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1235,11 +1255,12 @@ msgid "_Install security updates without confirmation" msgstr "_Biztonsági frissítések telepítése megerősítés nélkül" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1273,10 +1294,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Adja meg a felvenni kívánt csatorna teljes APT sorát\n" @@ -1333,8 +1354,9 @@ msgid "Check for new distribution releases" msgstr "Új disztribúciókiadások keresése" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1355,8 +1377,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "A frissítéskezelő ablak méretének tárolása" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Eltárolja a változások listáját és a megnevezéseket tartalmazó lista " @@ -1384,212 +1407,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 frissítések" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Közösségi karbantartású (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Nem-szabad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Közösségi karbantartású (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Közösségi karbantartású (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Nem-szabad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Nem-szabad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 biztonsági frissítések" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Telepítés" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Hivatalosan támogatott" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Hivatalosan támogatott" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Közösségi karbantartású (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Nem-szabad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Néhány szoftver már nincs hivatalosan támogatva" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Szerzői jogi korlátozás alatt" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" @@ -1640,6 +1640,48 @@ msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Néhány szoftver már nincs hivatalosan támogatva" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Nincs elérhető frissítés" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Az Ön rendszere már frissítve lett." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Frissítés az Ubuntu 6.06 LTS " +#~ "változatra" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 biztonsági frissítések" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Frissítés az Ubuntu legújabb változatára" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nem telepíthető minden rendelkezésre álló frissítés" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "A rendszer elemzése\n" +#~ "\n" +#~ "A szoftverfrissítések programhibákat javítanak, megszüntetik a biztonsági " +#~ "sebezhetőségeket és új szolgáltatásokat biztosítanak." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Hivatalosan támogatott" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/id.po b/po/id.po index 82b44e53..de7b1d5a 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" @@ -129,9 +129,9 @@ msgstr "" "Berkas yang anda pilih tidak dapat dihapus. Silakan laporkan ini sebagai bug." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Silakan masukkan nama untuk cakram" msgid "Please insert a disc in the drive:" msgstr "Silakan masukan cakram ke dalam penggerak" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paket rusak" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "perangkat lunak ini. Silakan perbaiki terlebih dahulu dengan menggunakan " "synaptic atau apt-get sebelum melanjutkan hal ini." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menghitung pemutakhiran" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Kesalahan membuktikan keabsahan beberapa paket" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat menginstal '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -213,15 +213,16 @@ msgstr "" "ini sebagai bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Tidak dapat menebak meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -231,12 +232,12 @@ msgstr "" " Silakan instal dahulu salah satu paket di atas dengan menggunakan synaptic " "atau apt-get sebelum melanjutkan." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Gagal untuk fetch" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -246,15 +247,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Membaca cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +263,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Tidak menemukan mirror yang valid" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +287,11 @@ msgstr "" "Jika anda pilih 'no' pemutakhiran akan dibatalkan." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Membuat sumber baku?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +304,11 @@ msgstr "" "Haruskah entri baku untuk '%s' ditambahkan? Jika anda pilih 'No' " "pemutakhiran akan dibatalkan." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informasi gudang tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,13 +316,14 @@ msgstr "" "Meng-upgrade informasi gudang berakhir di dalam berkas yang tidak benar. " "Silakan laporkan ini sebagai bug." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Sumber dari pihak ketiga dilumpukan" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -329,11 +331,11 @@ msgstr "" "dapat mengaktifkan kembali setelah upgrade dengan alat 'software-properties' " "atau dengan synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Kesalahan pada waktu pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -341,11 +343,11 @@ msgstr "" "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah " "jaringan, silakan periksa koneksi jaringan anda dan ulangi." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Kapasitas cakram tidak mencukupi" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Apakah anda ingin memulai pemutakhiran?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Tidak dapat menginstal pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +379,11 @@ msgstr "" "Upgrade dibatalkan sekarang. Sistem anda dapat menjadi tidak dapat " "digunakan. Perbaikan sedang berjalan (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Tidak dapat mengunduh pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,17 +391,18 @@ msgstr "" "Upgrade dibatalkan sekarang. Silakan periksa koneksi internet anda atau " "media instalasi dan coba lagi nanti. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "disokong melalui komunitas ('universe').\n" @@ -407,23 +410,23 @@ msgstr "" "Jika anda tidak mengaktifkan komponen 'universe' paket ini akan diajurkan " "untuk penghapusan dalam langkah selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Hapus paket usang?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Lewati Langkah Ini" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Hapus" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Kesalahan pada waktu commit" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -432,26 +435,31 @@ msgstr "" "bawah untuk informasi lebih lanjut. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Sistem dikembalikan ke keadaan awal" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Memeriksa manajer paket" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Memutakhirkan informasi gudang" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Informasi paket tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -465,19 +473,19 @@ msgstr "" "Ini mengindikasikan adanya kesalahan serius, silakan laporkan ini sebagai " "bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Menanyakan konfigurasi" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Meng-upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Mencari perangkat lunak usang" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Upgrade sistem telah selesai." @@ -498,7 +506,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Mengunduh berkas %li dari %li pada %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Sekitar %li menit lagi" @@ -528,23 +536,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Mengganti berkas konfigurasi\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Perintah 'diff' tidak dapat ditemukan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Terjadi kesalahan fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -559,25 +573,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket akan dihapus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s paket baru akan diinstal." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket akan diupgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -585,7 +599,7 @@ msgid "" "You have to download a total of %s. " msgstr "Anda harus mengunduh sebanyak %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -594,31 +608,34 @@ msgstr "" "Upgrade membutuhkan waktu beberapa jam dan tidak dapat dibatalkan setelah " "itu." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Untuk mencegah kehilangan data silakan tutup seluruh aplikasi dan dokumen." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Tidak dapat menemukan upgrade apapun" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Sistem anda telah up-to-date" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Sistem anda telah diupgrade" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Hapus %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instal %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" @@ -652,11 +669,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Diperlukan reboot" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -693,10 +710,8 @@ msgid "Start the upgrade?" msgstr "Mulai upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Mengupgrade ke Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -819,9 +834,10 @@ msgid "Verfication failed" msgstr "Verifikasi gagal" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Gagal memeriksa upgrade. Mungkin terjadi masalah dengan jaringan atau dengan " "server. " @@ -848,16 +864,16 @@ msgstr "Mengunduh berkas %li dari %li dengan %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -865,133 +881,124 @@ msgstr "" "Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet " "anda." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Pemutakhiran lewat Internet" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Instal Update" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Upgrade ke versi Ubuntu terakhir" +msgid "Normal updates" +msgstr "_Instal Update" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Instal Update" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versi %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Mengunduh senarai dari perubahan..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Periksa" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Ukuran unduh: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Sistem anda telah up-to-date" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Pemutakhiran selesai" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Instal Update" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versi baru: %s (Ukuran: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versi %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Distribusi anda tidak disokong lagi" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1008,17 @@ msgstr "" "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www." "ubuntu.com untuk informasi lebih lanjut." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Luncuran distribusi baru '%s' telah tersedia" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Indeks perangkat lunak telah rusak" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,58 +1042,67 @@ msgstr "" "Properties\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Memelihara sistem anda up-to-date" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Menguji sistem anda\n" +"Kesalahan memindai CD\n" "\n" -"Pemutakhiran perangkat lunak memperbaiki kesalahan, melenyapkan kelemahan " -"keamanan dan menyediakan fitur baru." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Memelihara sistem anda up-to-date" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Mulai upgrade?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Batalkan _Unduh" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Perubahan" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Peri_ksa" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Periksa kanal perangkal lunak untuk pemutakhiran terbaru" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Deskripsi" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Catatan Luncuran" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Tampilkan kemajuan dari berkas tunggal" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Perangkat Lunak Mutakhir" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1094,32 +1110,37 @@ msgstr "" "Perangkat lunak nutakhir memperbaiki kesalahan, menyingkirkan kelemahan " "keamanan dan menyediakan fitur baru." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade ke versi Ubuntu terakhir" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Periksa" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Lanjutkan Upgrade" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Sembunyikan informasi ini di masa depan" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instal Update" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Perubahan" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1229,11 +1250,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instal pemutakhiran keamanan tanpa perlu konfirmasi" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1267,10 +1289,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Masukkan baris lengkap APT dari kanal yang ingin anda tambah Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Mengupgrade ke Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Pemutakhiran lewat Internet" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Upgrade ke versi Ubuntu terakhir" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Menguji sistem anda\n" +#~ "\n" +#~ "Pemutakhiran perangkat lunak memperbaiki kesalahan, melenyapkan kelemahan " +#~ "keamanan dan menyediakan fitur baru." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Resmi disokong" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/it.po b/po/it.po index b38a79e6..73c6a132 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -135,9 +135,9 @@ msgstr "" "bug." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -153,11 +153,11 @@ msgstr "Inserire un nome per il disco" msgid "Please insert a disc in the drive:" msgstr "Inserire un disco nell'unità:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pacchetti non integri" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -166,23 +166,23 @@ msgstr "" "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get" "\" per risolvere il probelma." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Impossibile aggiornare i meta-pacchetti richiesti" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'aggiornamento" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -191,11 +191,11 @@ msgstr "" "dell'aggiornamento. Notificare questo evento come bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Errore nell'autenticare alcuni pacchetti" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Impossibile installare \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -219,15 +219,16 @@ msgstr "" "evento come bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -237,12 +238,12 @@ msgstr "" " Prima di procedere, usare synaptic o apt-get per installare uno dei " "pacchetti sopra menzionati." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Prelievo fallito" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -252,15 +253,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Lettura della cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +269,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Non è stato trovato alcun mirror valido" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -293,11 +294,11 @@ msgstr "" "Scegliendo di no, l'aggiornamento verrà annullato." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Generare le sorgenti predefinite?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -311,11 +312,11 @@ msgstr "" "Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento " "verrà annullato." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informazioni sul repository non valide" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -323,13 +324,14 @@ msgstr "" "L'aggiornamento delle informazioni sul repository ha generato un file non " "valido. Notificare questo evento come bug." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Sorgenti di terze parti disabilitate" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -337,11 +339,11 @@ msgstr "" "list». È possibilie abilitarle di nuovo dopo l'aggiornamento con lo " "strumento «software-properties» o con synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Errore durante l'aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -349,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Spazio libero su disco insufficiente" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -365,15 +367,15 @@ msgstr "" "usando \"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Iniziare l'aggiornamento?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Impossibile installare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -386,11 +388,11 @@ msgstr "" "uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -" "a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Impossibile scaricare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -398,17 +400,18 @@ msgstr "" "Interruzione immediata dell'aggiornamento. Controllare la connessione a " "internet o il supporto di installazione e riprovare. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Software non più supportato ufficialmente" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "ufficialmente; ora sono semplicemente mantenuti dalla comunità " @@ -417,23 +420,23 @@ msgstr "" "Se non è abilitato il repository «universe», verrà suggerita la rimozione di " "questi pacchetti al prossimo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Rimuovere i pacchetti obsoleti?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Salta questo passo" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Rimuovi" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Errore durante il commit" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -442,26 +445,31 @@ msgstr "" "seguente per maggiori informazioni. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Ripristino stato originale del sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Controllo gestore dei pacchetti" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aggiornamento delle informazione sui repository" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Informazioni di pacchetto non valide" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -474,19 +482,19 @@ msgstr "" "trovare il pacchetto essenziale «%s».\n" "Ciò indica un errore grave, segnalare questo evento come un bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Richiesta di conferma" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Ricerca di software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "L'aggiornamento del sistema è stato completato." @@ -507,7 +515,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Scaricamento del file %li di %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Circa %li minuti rimanenti" @@ -537,23 +545,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Sostituire il file di configurazione\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Il comando \"diff\" non è stato trovato" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Si è verificato un errore fatale" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -569,28 +583,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pacchetto sta per essere rimosso." msgstr[1] "%s pacchetti stanno per essere rimossi." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nuovo pacchetto sta per essere installato." msgstr[1] "%s nuovi pacchetti stanno per essere installati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pacchetto sta per essere aggiornato." msgstr[1] "%s pacchetti stanno per essere aggiornati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -598,7 +612,7 @@ msgid "" "You have to download a total of %s. " msgstr "È necessario scaricare un totale di %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -607,32 +621,35 @@ msgstr "" "L'aggiornamento può richiedere diverse ore e non può essere annullato in " "nessun momento successivo." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Chiudere tutte le applicazioni e i documenti aperti per prevenire la perdita " "di dati." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Impossibile trovare aggiornamenti" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Il sistema è aggiornato!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Il sistema è già stato aggiornato." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Rimuovere %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installare %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Aggiornare %s" @@ -666,11 +683,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Riavvio richiesto" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?" @@ -705,10 +722,8 @@ msgid "Start the upgrade?" msgstr "Avviare l'aggiornamento?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Aggiornamento a Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -836,9 +851,10 @@ msgid "Verfication failed" msgstr "Verifica fallita" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Fallita la verifica dell'aggiornamento. Potrebbe dipendere da un problema " "con la connessione di rete o con il server. " @@ -865,18 +881,18 @@ msgstr "Scaricamento del file %li di %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Scaricamento del file %li di %li a velocità sconosciuta" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -884,134 +900,125 @@ msgstr "" "Fallito lo scaricamento dell'elenco dei cambiamenti. Verificare la " "connessione ad Internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installazione degli aggiornamenti" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Aggiorna all'ultima versione di Ubuntu" +msgid "Normal updates" +msgstr "Installazione degli aggiornamenti" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installazione degli aggiornamenti" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Impossibile installare tutti gli aggiornamenti disponibili" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versione %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Scaricamento dell'elenco dei cambiamenti..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Verifica" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Dati da scaricare: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Il sistema è aggiornato!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Attendere, l'operazione potrebbere richiedere del tempo." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aggiornamento completato" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Verifica degli aggiornamenti..." + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nuova versione: %s (Dimensione: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versione %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "La distribuzione in uso non è più supportata" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1028,17 @@ msgstr "" "versione più aggiornata di Ubuntu Linux. Per maggiori informazioni " "consultare http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "L'indice dei programmi è rovinato" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1055,58 +1062,67 @@ msgstr "" "\"Amministrazione\" -> \"Proprietà software\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Mantenere aggiornato il sistema" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Esame del sistema\n" +"Errore nella scansione del CD\n" "\n" -"Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " -"sicurezza ed aggiungono nuove funzionalità." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Mantenere aggiornato il sistema" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Avviare l'aggiornamento?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Annulla _scaricamento" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambiamenti" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Verifica" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Verifica la presenza di nuovi aggiornamenti nei canali software" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrizione" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Note di rilascio" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Mostra l'avanzamento dei singoli file" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Aggiornamenti software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1114,32 +1130,37 @@ msgstr "" "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " "sicurezza ed aggiungono nuove funzionalità." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "A_ggiorna" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aggiorna all'ultima versione di Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Verifica" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Riprendi aggiornamento" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Non mostrare più queste informazioni" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "I_nstalla aggiornamenti" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Cambiamenti" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1250,11 +1271,12 @@ msgid "_Install security updates without confirmation" msgstr "I_nstallare gli aggiornamenti di sicurezza senza richiedere conferma" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1288,10 +1310,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Inserire la riga APT completa del canale che si vuole aggiungereUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Aggiornamento a Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Aggiorna all'ultima versione di Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Impossibile installare tutti gli aggiornamenti disponibili" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Esame del sistema\n" +#~ "\n" +#~ "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " +#~ "sicurezza ed aggiungono nuove funzionalità." + +#~ msgid "Oficially supported" +#~ msgstr "Supportato ufficialmente" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1837,10 +1880,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "Sections" #~ msgstr "Sezioni" -#, fuzzy -#~ msgid "Check for available updates" -#~ msgstr "Verifica degli aggiornamenti..." - #~ msgid "Sections:" #~ msgstr "Sezioni:" diff --git a/po/ja.po b/po/ja.po index 56e3fa45..0a21dcc4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu Japanese Team \n" @@ -132,9 +132,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択した鍵を削除できませんでした。バグとして報告してください。" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -150,11 +150,11 @@ msgstr "ディスク名を入力してください" msgid "Please insert a disc in the drive:" msgstr "ディスクをドライブに挿入してください:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "壊れたパッケージ" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,34 +162,34 @@ msgstr "" "システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま" "す。 Synaptic や apt-get を使って最初に修正してください。" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "要求されたメタパッケージがアップグレードできません" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "必須パッケージが削除されます" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "アップグレードが算定できません" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "算定中に解決できない問題がおきました。バグとして報告してください。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "いくつかのパッケージが認証されませんでした" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' がインストールできません" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,15 +212,16 @@ msgstr "" "要求されたパッケージのインストールができません。バグとして報告してください。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "メタパッケージを推測できません" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" "開始前に Synaptic や apt-get を使用して上記のパッケージのうちのひとつをインス" "トールしてください。" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "取得に失敗しました" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "キャッシュを読み込み中" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "正しいミラーが見つかりません" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -284,11 +285,11 @@ msgstr "" "キャンセルします。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "標準のソースを生成しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -301,11 +302,11 @@ msgstr "" "'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートを" "キャンセルします。" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "リポジトリ情報が無効です" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -313,13 +314,14 @@ msgstr "" "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報" "告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "公式ではないソースが無効になりました" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -327,11 +329,11 @@ msgstr "" "アップグレード後に 'ソフトウェアのプロパティ' ツールか Synaptic を使用してく" "ださい。" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "アップデート中にエラー発生" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -339,11 +341,11 @@ msgstr "" "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。" "ネットワーク接続をチェックし、再びアップデートしてください。" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "ディスクの空き領域が足りません" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -355,15 +357,15 @@ msgstr "" "た一時パッケージを削除してください。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "アップグレードを開始しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "アップグレードをインストールできません" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -375,11 +377,11 @@ msgstr "" "アップグレードを中断しました。システムが使用できない状態になっている可能性が" "あります。ただいま修正を実行中です (dpkg --configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "アップグレードをダウンロードできません" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -387,17 +389,18 @@ msgstr "" "アップグレードを中断しました。インターネット接続またはインストールメディア" "(CD-ROMなど)をチェックし。再試行してください。 " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "いくつかのソフトウェアはもう公式にサポートされません" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "インストールされているこれらのパッケージは、もう公式にサポートされておらず、" "コミュニティサポートになっています('universe')。\n" @@ -405,23 +408,23 @@ msgstr "" "'universe' を有効にしないと、これらのパッケージは次のステップで削除することを" "提案します。 " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "不要なパッケージを削除しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "このステップをスキップ(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "削除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "コミット中にエラー" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -430,26 +433,31 @@ msgstr "" "ください。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "システムを元に戻し中" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "パッケージマネージャをチェック中" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "リポジトリ情報をアップデート" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "無効なパッケージ情報" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -461,19 +469,19 @@ msgstr "" "パッケージ情報のアップデートのあと、重要パッケージ '%s' が見つかりません。\n" "このメッセージは深刻なエラーです。バグとして報告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "確認する" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "アップグレード中" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "古いソフトウェアを検索する" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "システムのアップグレードが完了しました。" @@ -494,7 +502,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "およそ残り %li 分" @@ -524,23 +532,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "設定ファイル %s\n" "を置き換えますか？" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "'diff' コマンドが見つかりません" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "重大なエラーが発生しました" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -555,25 +569,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s つのパッケージが削除されます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s·つのパッケージがインストールされます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s·つのパッケージがアップグレードされます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -581,39 +595,42 @@ msgid "" "You have to download a total of %s. " msgstr "全部で %s つのパッケージをダウンロードする必要があります。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "アップグレードには数時間かかり、今後一切キャンセルはできません。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "データの損失を避けるため、すべてのアプリケーションとドキュメントを閉じてくだ" "さい。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "アップグレードが見つかりません" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "システムは最新の状態です!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "システムはすでに最新の状態です。" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "削除されるパッケージ: %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "インストール %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "アップグレード %s" @@ -647,11 +664,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "再起動してください" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "アップグレードが終了しました。再起動が必要ですが、すぐに実行しますか？" @@ -687,11 +704,8 @@ msgid "Start the upgrade?" msgstr "アップグレードを開始しますか？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Ubuntu 6.06 LTS にアップデート中" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -813,9 +827,10 @@ msgid "Verfication failed" msgstr "検証に失敗しました" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "アップグレードの検証に失敗しました。おそらくネットワークまたはサーバの問題で" "す。 " @@ -842,16 +857,16 @@ msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" msgid "Downloading file %li of %li with unknown speed" msgstr "ダウンロード中: 速度不明で %li のうち %li" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "変更点がまだ取得できません。あとで試してください。" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "変更点がまだ取得できません。あとで試してください。" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -859,133 +874,124 @@ msgstr "" "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ" "い。" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 セキュリティアップデート" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "アップデートをインストール中" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Ubuntu の最新バージョンにアップグレード" +msgid "Normal updates" +msgstr "アップデートをインストール中" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "アップデートをインストール中" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "すべてのアップデートをインストールすることができません" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "バージョン %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "変更点を取得中..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "チェック(_C)" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "ダウンロードサイズ: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "システムは最新の状態です!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 個のアップデートがインストールされます" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "しばらくお待ちください。少々時間がかかります。" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "アップデートが完了しました" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "インストールできるアップデートをチェック" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新しいバージョン: %s (サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "バージョン %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "このディストリビューションはすでにサポート対象外です" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -995,17 +1001,17 @@ msgstr "" "Ubuntu Linux にアップグレードしてください。\r\n" "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "ソフトウェアのインデックスが壊れています" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,58 +1035,67 @@ msgstr "" "Properties)\" で行います。" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "システムを最新の状態にする" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"システムを解析中です\n" +"CDスキャン中のエラー\n" "\n" -"ソフトウェアアップデートはエラーを修正し、セキュリティホールを修正し、新機能" -"を提供します。" +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "システムを最新の状態にする" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "アップグレードを開始しますか？" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "ダウンロードをキャンセル(_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "変更点" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "再チェック(_K)" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "新しいアップデートの調査のためにソフトウェアチャンネルをチェックします" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "説明" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "リリースノート" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "個々のファイルの進捗を表示" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "ソフトウェアのアップデート" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1088,32 +1103,37 @@ msgstr "" "ソフトウェアアップデートはエラーを訂正し、セキュリティホールを修正し、新機能" "を提供します。" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "アップグレード(_P)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Ubuntu の最新バージョンにアップグレード" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "チェック(_C)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "アップグレードを再開する(_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "今後この情報を隠す(_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "アップデートをインストール(_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "変更点" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1224,11 +1244,12 @@ msgid "_Install security updates without confirmation" msgstr "確認せずにセキュリティアップデートをインストール(_I)" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1262,10 +1283,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "追加したい完全な APT line を入力してください。\n" @@ -1324,8 +1345,9 @@ msgid "Check for new distribution releases" msgstr "新しいディストリビューションのリリースをチェックする" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1345,8 +1367,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "アップデートマネージャのダイアログサイズを復元" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "変更点と概要のリストを含んだ欄の状態を復元する" @@ -1372,212 +1395,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 アップデート" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "寄贈ソフトウェア" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非フリー (Multiuniverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非フリー (Multiuniverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 セキュリティアップデート" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "アップデートをインストール中" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu·5.10·'Breezy·Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "公式サポート" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu·5.10·'Breezy·Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 バックポート" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "公式サポート" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 バックポート" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu·5.10·'Breezy·Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非フリー (Multiuniverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "いくつかのソフトウェアはもう公式にサポートされません" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "限定的な著作権(Restricted)" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 バックポート" @@ -1628,6 +1629,47 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア" msgid "Non-DFSG-compatible Software" msgstr "DFSGに適合しないソフトウェア" +#~ msgid "Some software no longer officially supported" +#~ msgstr "いくつかのソフトウェアはもう公式にサポートされません" + +#~ msgid "Could not find any upgrades" +#~ msgstr "アップグレードが見つかりません" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "システムはすでに最新の状態です。" + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Ubuntu 6.06 LTS にアップデート中" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 セキュリティアップデート" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Ubuntu の最新バージョンにアップグレード" + +#~ msgid "Cannot install all available updates" +#~ msgstr "すべてのアップデートをインストールすることができません" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "システムを解析中です\n" +#~ "\n" +#~ "ソフトウェアアップデートはエラーを修正し、セキュリティホールを修正し、新機" +#~ "能を提供します。" + +#~ msgid "Oficially supported" +#~ msgstr "公式サポート" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1769,9 +1811,6 @@ msgstr "DFSGに適合しないソフトウェア" #~ "アップデートによってソフトウェアの問題を修正し、セキュリティホールを除去" #~ "し、新機能を追加します。" -#~ msgid "Check for available updates" -#~ msgstr "インストールできるアップデートをチェック" - #~ msgid "Sections:" #~ msgstr "セクション:" diff --git a/po/ka.po b/po/ka.po index b5602a0e..152b2305 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian \n" @@ -133,9 +133,9 @@ msgstr "" "ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "შეიყვანეთ დისკის სახელი" msgid "Please insert a disc in the drive:" msgstr "მოათავსეთ დისკი დისკწამყვანში:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "გაფუჭებული პაკეტები" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,25 +164,25 @@ msgstr "" "პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და " "შემდეგ გააგრძელეთ." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 #, fuzzy msgid "A essential package would have to be removed" msgstr "A არსებითი -სკენ" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 #, fuzzy msgid "Could not calculate the upgrade" msgstr "არა" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -191,11 +191,11 @@ msgstr "" "ხარვეზი. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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,40 +205,40 @@ msgstr "" "ბრაკი. იქნებ მოგვიანბით კიდევ ერთხელ სცადოთ. ქვევით იხილეთ არა-" "ავთენთიფიცერული პაკეტების სია." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' ვერ დაყენდა" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "მეტა-პაკეტი ვერ გამოვიცანით" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 #, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" "არა შეიცავს a ან და არა -სკენ ვერსია ის\n" " ის ან." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "ვერ განხორციელდა -სკენ" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -248,15 +248,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "მიმდინარეობს ქეშის წაკითხვა" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "არავითარი გამოსადეგი სერვერის ანარეკლი" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 #, fuzzy msgid "Generate default sources?" msgstr "გენერაცია ნაგულისხმევი?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "რეპოზიტორიების ინფორმაცია არასწორეა" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -307,24 +307,24 @@ msgstr "" "რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ " "ხარვეზი." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 #, fuzzy msgid "Third party sources disabled" msgstr "გამორთული" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 #, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "განახლებისას მოხდა შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "გნებავთ განახლების დაწყება?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 #, fuzzy msgid "Could not install the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -364,51 +364,50 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "ახლა -ში A a." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 #, fuzzy msgid "Could not download the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 #, fuzzy msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "ახლა ან და " -#: ../DistUpgrade/DistUpgradeControler.py:488 -#, fuzzy -msgid "Some software no longer officially supported" -msgstr "არა" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 #, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "წავშალო მოძველებული პაკეტები?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "ნაბიჯის გა_მოტოვება" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_წაშლა" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 #, fuzzy msgid "Error during commit" msgstr "შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 #, fuzzy msgid "" "Some problem occured during the clean-up. Please see the below message for " @@ -416,26 +415,31 @@ msgid "" msgstr "-თვის ინფორმაცია " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "ვამოწმებ პროგრამულ მენეჯერს" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "რეპოზტორიის ინფორმაციის განახლება" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "გაფუჭებული პაკეტის შესახებ ინფორმაცია" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -445,21 +449,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 #, fuzzy msgid "Asking for confirmation" msgstr "-თვის" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "მიმდინარეობს განახლებების ჩაყენება" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 #, fuzzy msgid "Searching for obsolete software" msgstr "ვეძებ -თვის" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 #, fuzzy msgid "System upgrade is complete." msgstr "სისტემა ტოლია სრული." @@ -481,7 +485,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -513,21 +517,27 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, fuzzy msgid "The 'diff' command was not found" msgstr "არა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 #, fuzzy msgid "A fatal error occured" msgstr "A შეცდომა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -538,25 +548,25 @@ msgstr "a და შემცველობა და -ში ახლა თ #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." -msgstr[0] "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." +msgstr[0] "A არსებითი -სკენ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -564,38 +574,41 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "საათი და ნებისმიერი დრო." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 #, fuzzy msgid "To prevent data loss close all open applications and documents." msgstr "ვის დახურვა ყველა გახსნა და დოკუმენტები." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "ვერ ვპოულობ განახლებებს" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "თქვენი სისტემა განახლებულია" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "თქვენი სისტემა სულ ახლახანს განახლდა." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr " ამოშლა %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "დაყენება %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "ჩასაყენებელი განახლება %s" @@ -629,11 +642,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "საჭიროა გადატვირთვა" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 #, fuzzy msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" @@ -668,9 +681,8 @@ msgid "Start the upgrade?" msgstr " გაშვება" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" -msgstr " -სკენ" +msgid "Upgrading Ubuntu to version 6.10" +msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -801,8 +813,8 @@ msgstr "ვერ შედგა" #: ../UpdateManager/DistUpgradeFetcher.py:222 #, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "ვერ შედგა a ან " #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -827,152 +839,143 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "ვერ განხორციელდა -სკენ სია ის ინტერნეტი." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "განახლებების _დაყენება" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "განახლება -სკენ ვერსია ის" +msgid "Normal updates" +msgstr "განახლებების _დაყენება" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "განახლებების _დაყენება" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "ვერსია %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "მიმდინარეობს ჩამოქაჩვა სია ის." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "შ_ემოწმება" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "ჩამოსატვირთის ზომა: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "თქვენი სისტემა განახლებულია" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "განახლება გასრულებულია" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "განახლებების _დაყენება" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "ახალი ვერსია: %s (ზომა: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "ვერსია %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 #, fuzzy msgid "" "You will not get any further security fixes or critical updates. Upgrade to " @@ -982,17 +985,17 @@ msgstr "" "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი " "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "პროგრამების სიის ინდექსი დაზიანებულია" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 #, fuzzy msgid "" "It is impossible to install or remove any software. Please use the package " @@ -1013,94 +1016,108 @@ msgstr "" "პროგრამა პარამეტრები." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +#, fuzzy +msgid "Keep your system up-to-date" +msgstr " დატოვება -სკენ თარიღი" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"ვამოწმებ თქვენს სისტემას\n" +"ვერ მოხერხდა CD-ს წაკითხვა\n" "\n" -"მოცემული პროგრამა გიჩვენებთ განახლებებს, გაასწორებს სისტემურ შეცდომებს და " -"წარმოგიდგენთ ახალ შესაძლებლობებს." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:6 #, fuzzy -msgid "Keep your system up-to-date" -msgstr " დატოვება -სკენ თარიღი" +msgid "Starting update manager" +msgstr " გაშვება" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "ჩამოტვირთვის _გაუქმება" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "ცვლილებები" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "შე_მოწმება" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 #, fuzzy msgid "Check the software channels for new updates" msgstr "შემოწმება -თვის ახალი" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "აღწერილობა" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "ვერსიის მონაცემები" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 #, fuzzy msgid "Show progress of single files" msgstr "ჩვენება მიმდინარეობა ის ცალი" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "პროგრამული განახლებები" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "პროგრამა სწორეა და ახალი." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 #, fuzzy msgid "Upgrade to the latest version of Ubuntu" msgstr "განახლება -სკენ ვერსია ის" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "შ_ემოწმება" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "განახლება _გაგრძელება" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_დამალე მომავალში მოცემული ინფორმაცია" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "განახლებების _დაყენება" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "ცვლილებები" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1217,10 +1234,10 @@ msgstr "დაყენება" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 #, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1250,10 +1267,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" " შეყვანა სრული ის -სკენ დამატება n ტიპი მდებარეობა და " @@ -1310,7 +1327,7 @@ msgstr "შემოწმება -თვის ახალი დისტ #: ../data/update-manager.schemas.in.h:3 #, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "-თვის ტოლია -სკენ სია -სკენ -ში." @@ -1333,7 +1350,7 @@ msgstr "ზომა ის განახლება დიალოგი" #: ../data/update-manager.schemas.in.h:7 #, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "ის შეიცავს სია ის და აღწერა" @@ -1360,209 +1377,187 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 განახლებები" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "არათავისუფალი (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "არათავისუფალი (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "არათავისუფალი (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "განახლებების _დაყენება" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "არათავისუფალი (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "არა" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 #, fuzzy msgid "Restricted copyright" msgstr "შეზღუდული" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" @@ -1616,6 +1611,43 @@ msgstr "პროგრამა თავისუფალი დამოკ msgid "Non-DFSG-compatible Software" msgstr "პროგრამა" +#, fuzzy +#~ msgid "Some software no longer officially supported" +#~ msgstr "არა" + +#~ msgid "Could not find any upgrades" +#~ msgstr "ვერ ვპოულობ განახლებებს" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "თქვენი სისტემა სულ ახლახანს განახლდა." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr " -სკენ" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "განახლება -სკენ ვერსია ის" + +#~ msgid "Cannot install all available updates" +#~ msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "ვამოწმებ თქვენს სისტემას\n" +#~ "\n" +#~ "მოცემული პროგრამა გიჩვენებთ განახლებებს, გაასწორებს სისტემურ შეცდომებს და " +#~ "წარმოგიდგენთ ახალ შესაძლებლობებს." + #, fuzzy #~ msgid "" #~ "Some updates require the removal of further software. Use the function " diff --git a/po/ko.po b/po/ko.po index f2212584..440714d0 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl \n" "Language-Team: Korean \n" @@ -128,9 +128,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -146,11 +146,11 @@ msgstr "디스크에 사용할 이름을 입력하십시오." msgid "Please insert a disc in the drive:" msgstr "드라이브에 디스크를 넣으십시오:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "망가진 꾸러미" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -158,23 +158,23 @@ msgstr "" "이 소프트웨어로 수정할 수 없는 망가진 꾸러미가 있습니다. 진행 전에 먼저 시냅" "틱이나 apt-get을 사용하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "요청된 메타 꾸러미를 업그레이드 할 수 없습니다" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "필수 꾸러미를 지워야만 합니다." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -183,11 +183,11 @@ msgstr "" "버그를 보고하여 주십시오. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "꾸러미 인증 오류" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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,27 +196,28 @@ msgstr "" "인증하는데 실패한 꾸러미가 있습니다. 일시적인 네트워크 문제일 수 있으니 나중" "에 다시 시도하십시오. 인증에 실패한 꾸러미의 목록은 다음과 같습니다." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s'을(를) 설치할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "요청된 꾸러미를 설치할 수 없습니다. 버그로 보고하여 주십시오. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "메타 꾸러미를 추측할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -225,12 +226,12 @@ msgstr "" " 위의 꾸러미 중 하나를 시냅틱이나 apt-get을 이용해서 먼저 설치하시기 바랍니" "다." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "가져오기가 실패했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -240,15 +241,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "캐시를 읽는 중" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -256,11 +257,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "적합한 미러 서버를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -280,11 +281,11 @@ msgstr "" "'아니오'를 고르면 업데이트가 취소됩니다." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "기본 설정된 소스 목록을 만듭니까?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -297,11 +298,11 @@ msgstr "" "'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 고르면 업데이트가 취소됩" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "저장소 정보가 올바르지 않습니다" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -309,13 +310,14 @@ msgstr "" "저장소 정보를 업그레이드하는 것이 잘못된 파일로 만들어졌습니다. 버그를 보고하" "여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "써드 파티 소스는 이용할 수 없습니다" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -323,11 +325,11 @@ msgstr "" "properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하게 할 수 있습" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "업데이트 중 오류" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -335,11 +337,11 @@ msgstr "" "업데이트를 하는 동안에 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많습" "니다. 네트워크의 연결 상태를 확인하시고 다시 시도하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "디스크 여유 공간이 충분하지 않습니다." -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -351,15 +353,15 @@ msgstr "" "에 사용했던 임시 꾸러미들을 삭제하시기 바랍니다." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "업그레이드를 설치하지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -371,11 +373,11 @@ msgstr "" "업그레이드가 중지되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. " "(dpkg --configure -a)를 실행하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "업그레이드 파일을 다운로드 할 수 없습니다." -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -383,17 +385,18 @@ msgstr "" "업그레이드가 중지되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도" "하십시오. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "이 소프트웨어들은 더 이상 공식적으로 지원하지 않으며, 이제 Universe 계열에 해" "당합니다.\n" @@ -401,23 +404,23 @@ msgstr "" "'Universe' 저장소를 활성화하지 않았다면 다음 단계에서 이 꾸러미들을 삭제할 " "수 있습니다. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "못쓰게 된 꾸러미를 삭제하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "이 단계 건너뛰기(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "삭제(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "커밋 도중 오류 발생" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -426,26 +429,31 @@ msgstr "" "보를 얻으실 수 있습니다. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "시스템을 원상태로 복구하는 중" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "꾸러미 관리자 확인 중" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "저장소 정보 업데이트 중" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "잘못된 꾸러미 정보" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -458,19 +466,19 @@ msgstr "" "다.\n" "심각한 오류입니다. 버그를 보고하여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "확인을 요청하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "업그레이드 하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "못 쓰게 된 소프트웨어를 검색하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "시스템 업그레이드가 끝났습니다." @@ -491,7 +499,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "내려받는 중, %li의 %li 파일, 속도 %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "%li 분 정도 남았음" @@ -521,23 +529,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "설정 파일을 바꾸시겠습니까?\n" "'%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "'diff' 명령어를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "심각한 오류 발생" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -551,25 +565,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "꾸러미 %s 개가 삭제될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "새로운 꾸러미가 %s 개 설치될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "꾸러미가 %s 개 업그레이드 될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -577,37 +591,40 @@ msgid "" "You have to download a total of %s. " msgstr "총 %s개의 꾸러미를 다운로드 합니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "업그레이드는 여러 시간이 걸릴 수 있고, 어떤 때에도 취소될 수 없습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문서를 닫으십시오." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "어떤 업그레이드 꾸러미도 찾을 수 없습니다." +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "시스템이 최신의 상태입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "이미 시스템이 업그레이드 되어 있습니다." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "%s 삭제" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s 설치" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s 업그레이드" @@ -641,11 +658,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "재부팅이 필요합니다." -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -681,11 +698,8 @@ msgid "Start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"우분투 6.06 LTS로 업그레이드하는 중" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -809,9 +823,10 @@ msgid "Verfication failed" msgstr "검사 실패" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "업그레이드를 검사하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니" "다. " @@ -838,149 +853,140 @@ msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "바뀐 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "우분투 5.10 보안 업데이트" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "업데이트를 설치(_I)" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "우분투 최신 버젼으로 업그레이드 합니다." +msgid "Normal updates" +msgstr "업데이트를 설치(_I)" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "업데이트를 설치(_I)" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "설치할 수 없는 업데이트가 있습니다" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "버전 %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "바뀐 목록을 다운로드 하는 중..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "점검(_C)" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "다운로드 크기: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "시스템이 최신의 상태입니다." - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "업데이트가 끝났습니다." -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "업데이트를 설치(_I)" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "새 버전: %s (크기: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "버전 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "더 이상 지원되지 않는 배포판입니다." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -990,17 +996,17 @@ msgstr "" "그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에" "서 보실 수 있습니다." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "새 배포판 '%s'를 이용할 수 있습니다" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "소프트웨어 목록이 망가졌습니다." -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1022,58 +1028,67 @@ msgstr "" "\"Software Properties\"에서 설정할 수 있습니다." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "시스템을 최신으로 유지하십시오." + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"시스템 검사 중\n" +"CD 검색 오류\n" "\n" -"소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" -"합니다." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "시스템을 최신으로 유지하십시오." +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "업그레이드를 시작하시겠습니까?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "다운로드 취소(_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "변경 사항" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "점검(_k)" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "새로운 업데이트를 위해 소프트웨어 채널을 확인합니다." -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "설명" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "릴리즈 정보" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "각 파일의 진행 상황 표시" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "소프트웨어 업데이트" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1081,32 +1096,37 @@ msgstr "" "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" "합니다." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "업그레이드(_p)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "우분투 최신 버젼으로 업그레이드 합니다." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "점검(_C)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "업그레이드 계속(_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "앞으로 이 정보 숨김(_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "업데이트를 설치(_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "변경 사항" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1214,11 +1234,12 @@ msgid "_Install security updates without confirmation" msgstr "확인없이 보안 업데이트 설치(_I)" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1252,10 +1273,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "추가하고자 하는 채널의 APT 줄을 완전히 입력하십시오.\n" @@ -1311,8 +1332,9 @@ msgid "Check for new distribution releases" msgstr "새로운 배포판을 확인합니다." #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1332,8 +1354,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "업데이트 관리자 대화상자의 크기를 저장합니다." #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "변경과 설명의 목록을 가지는 확장자의 상태를 저장합니다." @@ -1359,212 +1382,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "우분투 5.10 업데이트" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "자유소프트웨어 아님 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "자유소프트웨어 아님 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "자유소프트웨어 아님 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "우분투 5.10 보안 업데이트" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "업데이트를 설치(_I)" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "공식적으로 지원됨" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "우분투 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "우분투 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "공식적으로 지원됨" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "우분투 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "우분투 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "자유소프트웨어 아님 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "저작권 제한됨" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "우분투 5.10 Backports" @@ -1615,6 +1615,48 @@ msgstr "DFSG 호환이지만 자유소프트웨어가 아닌 의존성이 있는 msgid "Non-DFSG-compatible Software" msgstr "DFSG와 호환이 안되는 소프트웨어" +#~ msgid "Some software no longer officially supported" +#~ msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." + +#~ msgid "Could not find any upgrades" +#~ msgstr "어떤 업그레이드 꾸러미도 찾을 수 없습니다." + +#~ msgid "Your system has already been upgraded." +#~ msgstr "이미 시스템이 업그레이드 되어 있습니다." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "우분투 6.06 LTS로 업그레이드하는 중" +#~ "" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "우분투 5.10 보안 업데이트" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "우분투 최신 버젼으로 업그레이드 합니다." + +#~ msgid "Cannot install all available updates" +#~ msgstr "설치할 수 없는 업데이트가 있습니다" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "시스템 검사 중\n" +#~ "\n" +#~ "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제" +#~ "공합니다." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "공식적으로 지원됨" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/ku.po b/po/ku.po index 2029bd01..188b00b4 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paketên şikestî" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nikarî '%s' saz bike" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Jê bibe" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Tê bilindkirin" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Bilindkirina sîstemê temam bû." @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket dê were rakirin." msgstr[1] "%s paket dê werin rakirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s paket dê were sazkirin" msgstr[1] "%s paket dê werin sazkirin" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket dê were bilindkirin." msgstr[1] "%s paket dê werin bilindkirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -522,36 +533,39 @@ msgid "" "You have to download a total of %s. " msgstr "Pêwîst e tu bi tevahî %s daxî." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Sîstema te rojane ye" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Sîstema xwe berê hat bilindkirin." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "%s rake" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s saz bike" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s bilind bike" @@ -585,11 +599,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -620,7 +634,7 @@ msgid "Start the upgrade?" msgstr "Dest bi bilindkirinê were kirin?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -741,8 +755,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -765,163 +779,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -#, fuzzy -msgid "Updates of Ubuntu" -msgstr "Ubuntu tê bilindkirin" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" +msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Guhertoya %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Mezinahiya daxistinê: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Sîstema te rojane ye" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Rojanekirin temam bû" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Guhertoya nû: %s (Mezinahî: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Guhertoya %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -937,85 +938,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Dest bi bilindkirinê were kirin?" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Daxistinê _betal bike" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Guhartin" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Daxuyanî" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Guhartin" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1122,10 +1136,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1152,10 +1166,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1205,7 +1219,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1224,7 +1238,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1248,204 +1262,183 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Neazad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Neazad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neazad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Bi piştgirtiya fermî" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Bi piştgirtiya fermî" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Neazad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Bi piştgirtiya fermî" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1495,6 +1488,17 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Your system has already been upgraded." +#~ msgstr "Sîstema xwe berê hat bilindkirin." + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Ubuntu tê bilindkirin" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Bi piştgirtiya fermî" + #~ msgid "Download is complete" #~ msgstr "Daxistin hatiye temam kirin" diff --git a/po/lt.po b/po/lt.po index 47688c99..df8552d5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" @@ -129,9 +129,9 @@ msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Įveskite disko pavadinimą" msgid "Please insert a disc in the drive:" msgstr "Įdėkite diską į įrenginį:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Sugadinti paketai" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi „synaptic“ " "arba „apt-get“." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Negalima atnaujinti reikiamų metapaketų" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nepavyko paskaičiuoti atnaujinimo" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "tai kaip klaidą. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Klaida autentikuojant keletą paketų" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,16 +211,17 @@ msgstr "" "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 #, fuzzy msgid "Can't guess meta-package" msgstr "Negalima nuspėti meta paketo" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" " Prieš tęsdami pirmiausia įdiekite vieną iš šių paketų naudodamiesi " "„synaptic“ arba „apt-get“." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Atsiųsti nepavyko" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Nuskaitoma talpykla" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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,12 +262,12 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 #, fuzzy msgid "No valid mirror found" msgstr "Nerasta tinkamo įrašo" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -279,11 +280,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Ar sukurti numatytųjų šaltinių sąrašą?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -292,11 +293,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Saugyklų informacija netinkama" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -304,13 +305,14 @@ msgstr "" "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. " "Praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Trečiųjų šalių šaltiniai išjungti" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -318,11 +320,11 @@ msgstr "" "Juos galėsite vėl įjungti, kai baigsite atnaujinimą su „programų savybių“ " "įrankiu arba „Synaptic“ paketų tvarkykle." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Klaida atnaujinant" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -330,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Diske nepakanka laisvos vietos" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +345,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "At norite pradėti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nepavyko įdiegti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nepavyko atsiųsti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -375,17 +377,18 @@ msgstr "" "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba įdiegimo " "laikmeną ir bandykite dar. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "bendruomenė („universe“).\n" @@ -393,23 +396,23 @@ msgstr "" "Jei nesate įjungę „universe“ skyriaus, šie paketai bus siūlomi pašalinimui " "kitame žingsnyje. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Pašalinti pasenusius paketus?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Praleisti šį žingsnį" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "P_ašalinti" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -418,26 +421,31 @@ msgstr "" "pranešime. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Perkraunama sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Tikrinama paketų valdyklė" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Atnaujinama saugyklų informacija" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Netinkama paketo informacija" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -450,19 +458,19 @@ msgstr "" "paketo „%s“.\n" "Tai labai rimta problema, praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Klausiama patvirtinimo" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Atnaujinama" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Ieškoma pasenusios programinės įrangos" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Sistemos atnaujinimas baigtas." @@ -483,7 +491,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -513,23 +521,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Ar pakeisti konfigūracijos bylą\n" "„%s“?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Nerasta komanda „diff“" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Įvyko lemtinga klaida" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -545,31 +559,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Bus pašalintas %s paketas." msgstr[1] "Bus pašalinti %s paketai." msgstr[2] "Bus pašalinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Bus įdiegtas %s naujas paketas." msgstr[1] "Bus įdiegti %s nauji paketai." msgstr[2] "Bus įdiegta %s naujų paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "Bus atnaujintas %s paketas." msgstr[1] "Bus atnaujinti %s paketai." msgstr[2] "Bus atnaujinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -577,7 +591,7 @@ msgid "" "You have to download a total of %s. " msgstr "Turite atsisiųsti viso %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -585,32 +599,35 @@ msgid "" msgstr "" "Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Norint išvengti duomenų praradimo turite užverti visas atvertas programas ir " "dokumentus." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nepavyko rasti jokių atnaujinimų" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Jūsų sistema atnaujinta" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Jūsų sistema jau buvo atnaujinta." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Pašalinti %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Įdiegti %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Atnaujinti %s" @@ -644,11 +661,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Reikia perkrauti kompiuterį" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -687,10 +704,8 @@ msgid "Start the upgrade?" msgstr "Pradėti atnaujinimą?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Atnaujinama į Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -815,9 +830,10 @@ msgid "Verfication failed" msgstr "Tapatumo nustatymas nepavyko" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Atnaujinimo tapatumo nustatymas nepavyko. Gali būti tinklo arba serverio " "problema. " @@ -844,114 +860,100 @@ msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" msgid "Downloading file %li of %li with unknown speed" msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Diegiami atnaujinimai" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Atnaujinti iki naujausios Ubuntu versijos" +msgid "Normal updates" +msgstr "Diegiami atnaujinimai" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Diegiami atnaujinimai" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Negalima įdiegti visų galimų atnaujinimų" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Atsiunčiamas pakeitimų sąrašas..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Patikrinti" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Atsiuntimo dydis: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Jūsų sistema atnaujinta" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -959,35 +961,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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Palaukite, tai gali užtrukti." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Atnaujinimas užbaigtas" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Diegiami atnaujinimai" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nauja versija: %s (Dydis: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Jūsų distribucija daugiau nebepalaikoma" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -997,17 +1004,17 @@ msgstr "" "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie " "atnaujinimą rasite http://www.ubuntu.com ." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Programinės įrangos turinys sugadintas" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,59 +1038,67 @@ msgstr "" "naudodamiesi „Sistema“ -> „Administravimas“ -> „Programinės įrangos savybės“." #: ../data/glade/UpdateManager.glade.h:4 +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 #, fuzzy -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Not all updates can be installed" msgstr "" -"Ieškoma galimų atnaujinimų\n" +"Klaida skanuojant CD\n" "\n" -"Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " -"spragas bei suteikti naujas funkcijas." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Pradėti atnaujinimą?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Atšaukti _atsiuntimą" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Pakeitimai" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Ti_krinti" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Patikrinti programų kanalus dėl atnaujinimų" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Aprašymas" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Leidimo aprašymas" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Rodyti pavienių failų progresą" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Programinės įrangos atnaujinimai" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "" "Software updates correct errors, eliminate security vulnerabilities and " @@ -1092,32 +1107,37 @@ msgstr "" "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " "spragas bei suteikti naujas funkcijas." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "At_naujinti" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atnaujinti iki naujausios Ubuntu versijos" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Patikrinti" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Tęsti atnaujinimą" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Nerodyti šios informacijos ateityje" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Į_diegti atnaujinimus" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Pakeitimai" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1229,11 +1249,12 @@ msgid "_Install security updates without confirmation" msgstr "Į_diegti saugumo atnaujinimus neklausiant patvirtinimo" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1267,10 +1288,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Įveskite visą Jūsų norimo pridėti kanalo APT eilutę\n" @@ -1327,8 +1348,9 @@ msgid "Check for new distribution releases" msgstr "Tikrinti, ar yra išleista nauja distribucijos (OS) versija" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1350,7 +1372,7 @@ msgstr "Išsaugo update-manager dialogų dydį" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1378,211 +1400,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 atnaujinimai" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Ne Laisva (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 „Dapper Drake“" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ne Laisva (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ne Laisva (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 „Dapper Drake“" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 saugumo atnaujinimai" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Diegiami atnaujinimai" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Oficialiai palaikoma" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" -msgstr "Prižiūrima oficialiai" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Oficialiai palaikoma" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ne Laisva (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Apribotos autorinės teisės" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" @@ -1633,6 +1633,48 @@ msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis msgid "Non-DFSG-compatible Software" msgstr "Su DFSG nesuderinama programinė įranga" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Nepavyko rasti jokių atnaujinimų" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Jūsų sistema jau buvo atnaujinta." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Atnaujinama į Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 saugumo atnaujinimai" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Atnaujinti iki naujausios Ubuntu versijos" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Negalima įdiegti visų galimų atnaujinimų" + +#, fuzzy +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Ieškoma galimų atnaujinimų\n" +#~ "\n" +#~ "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti " +#~ "saugumo spragas bei suteikti naujas funkcijas." + +#~ msgid "Oficially supported" +#~ msgstr "Prižiūrima oficialiai" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/mk.po b/po/mk.po index 45c9194a..1b14fb90 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -136,7 +136,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -149,33 +149,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -184,23 +184,23 @@ msgstr "" "како бубачка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -210,24 +210,24 @@ msgstr "" "како бубачка. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -237,15 +237,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 #, fuzzy msgid "Generate default sources?" msgstr "Врати ги стандардните клучеви" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Грешка при отстранување на клучот" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -346,73 +346,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Веќе работи друг менаџер за пакети" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -422,20 +427,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -455,7 +460,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -488,19 +493,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -510,31 +521,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -542,36 +553,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "Вашиот систем е надграден!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -605,11 +620,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -640,7 +655,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -767,8 +782,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -792,16 +807,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Достапна е нова верзија на Убунту!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -810,101 +825,85 @@ msgstr "" "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет " "врска е активна." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Безбедносни надградби за Debian Stable" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Инсталирам надградби..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "Проверувам за надградби..." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Верзија %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, fuzzy, python-format msgid "Download size: %s" msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Вашиот систем е надграден!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -912,53 +911,58 @@ msgstr[0] "Инсталирам надградби..." msgstr[1] "Инсталирам надградби..." msgstr[2] "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Проверувам за надградби..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Верзија %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуција повеќе не е поддржана" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -974,86 +978,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Опис" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Надградба на софтвер" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Инсталирам надградби..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1168,10 +1184,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1200,10 +1216,10 @@ msgstr "Адреса:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Внесете ја комплетната линија за APT складиштето за да го додадете\n" "Language-Team: Malay \n" @@ -130,9 +130,9 @@ msgstr "" "ralat pepijat." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Sila masukkan nama untuk cakera padat" msgid "Please insert a disc in the drive:" msgstr "Sila masukkan cakera padat kedalam pemacu" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pakej rosak" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,23 +161,23 @@ msgstr "" "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-get " "sebelum meneruskan." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menjangka penaikkan taraf" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,23 +186,23 @@ msgstr "" "penaikkan. Sila laporkan ini sebagai ralat pepijat. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,15 +211,16 @@ msgstr "" "pepijat. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Pakej meta tidak dapat diduga." -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -229,11 +230,11 @@ msgstr "" "Sila pasangkan salah satu pakej diatas dahulu menggunakan synaptic ataupun " "apt-get sebelum meneruskan pemasangan." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -243,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -276,11 +277,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -289,23 +290,24 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Sumber ketiga tidak diaktifkan." -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -314,11 +316,11 @@ msgstr "" "selepas penaikkan taraf menggunakan alatan 'software-properties' ataupun " "'synaptic'." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Ralat semasa pengemaskinian." -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -327,11 +329,11 @@ msgstr "" "yang berkaitan dengan masaalah rangkaian, sila periksa dan cuba lagi " "sambungan rangkaian anda." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Muatak cakera keras tidak mencukupi." -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Anda mahu mulakan penaikkan taraf?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf." -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,11 +365,11 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sistem anda mungkin tidak stabil. " "Sistem 'recovery' telah dijalankan (dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai." -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -375,67 +377,72 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sila semak sambungan 'internet' atau " "media pemasangan anda dan cuba lagi. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 #, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "dan ianya hanya dibantu/sokong oleh 'community-supported('universe')\n" "Jika anda tidak megaktifkan 'universe', pakej-pakej ini akan dicadangkan " "untuk dikeluarkan di peringkat selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Keluarkan pakej-pakej yang sudah luput?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -445,19 +452,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -477,7 +484,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -509,19 +516,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -531,28 +544,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." +msgstr[0] "Satu pakej yang perlu terpaksa dikeluarkan" +msgstr[1] "Satu pakej yang perlu terpaksa dikeluarkan" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." -msgstr[0] "" -msgstr[1] "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -560,36 +573,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -623,11 +639,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -658,7 +674,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -780,8 +796,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -804,162 +820,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -975,84 +979,104 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" +msgstr "" +"Ralat semasa mengimbas Cakera Padat↵\n" +"↵\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" msgstr "" +"Ralat semasa mengimbas Cakera Padat↵\n" +"↵\n" +"%s" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1156,10 +1180,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1186,10 +1210,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1239,7 +1263,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1258,7 +1282,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1282,193 +1306,173 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1517,3 +1521,6 @@ msgstr "" #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" + +#~ msgid "Some software no longer officially supported" +#~ msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." diff --git a/po/nb.po b/po/nb.po index 9e675e7d..9f3a41e2 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" @@ -131,9 +131,9 @@ 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 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -149,11 +149,11 @@ msgstr "Vennligst oppgi et navn for platen" msgid "Please insert a disc in the drive:" msgstr "Vennligst sett inn en plate i CD-spilleren:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Skadede pakker" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,23 +162,23 @@ msgstr "" "av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic eller " "apt-get før du fortsetter." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke oppgradere nødvendige meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -187,11 +187,11 @@ msgstr "" "rapporter dette som en feil. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Kunne ikke autentisere noen pakker" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,15 +214,16 @@ msgstr "" "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Kan ikke gjette på meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -232,12 +233,12 @@ msgstr "" " Vennligst installer én av de nevnte pakkene først ved å bruke synaptic " "eller apt-get før du fortsetter." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Kunne ikke hente" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -247,15 +248,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Leser mellomlager" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Fant ikke noe gyldig speil" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -287,11 +288,11 @@ msgstr "" "Hvis du velger \"Nei\" vil oppgraderingen avbrytes." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Vil du opprette standardkilder?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -305,11 +306,11 @@ msgstr "" "Skal standard linjer for '%s' legges til? Hvis du velger 'Nei' vil " "oppdateringen avbrytes." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Ugyldig informasjon om arkiv" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -317,13 +318,14 @@ msgstr "" "Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst " "rapporter dette som en feil." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Tredjepartskilder er deaktivert" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -331,11 +333,11 @@ msgstr "" "aktivere dem etter oppgraderingen ved hjelp av verktøyet 'Egenskaper for " "programvare' eller med Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Feil under oppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -344,11 +346,11 @@ msgstr "" "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din " "og prøv igjen." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Ikke nok ledig diskplass" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -360,15 +362,15 @@ msgstr "" "bruke 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Ønsker du å starte oppgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Kunne ikke installere oppgraderingene" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -380,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Kunne ikke laste ned alle oppgraderingene." -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -392,17 +394,18 @@ msgstr "" "Oppgraderingen avbrytes nå. Vennligst sjekk internet-tilkoblingen eller " "installasjonsmediet og prøv på nytt. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Noe programvare er ikke lenger offisielt støttet" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "støttet av miljøet 'universe'.\n" @@ -410,23 +413,23 @@ msgstr "" "Hvis du ikke har 'universe' aktivert vil disse pakkene bli foreslått fjernet " "i neste steg. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Ønsker du å fjerne utdaterte pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Hopp over dette punktet" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Feil ved commit" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,26 +438,31 @@ msgstr "" "informasjon. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Gjenoppretter systemets originale tilstand" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Sjekker pakkehåndterer" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Oppdaterer informasjon om arkivet" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Ugyldig pakkeinformasjon" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +475,19 @@ msgstr "" "pakken '%s'.\n" "Dette indikerer en alvorlig feil, vennligst rapportér denne feilen." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Spør om bekreftelse" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Oppgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Søker etter utdatert programvare" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Systemoppgraderingen er fullført" @@ -500,7 +508,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Laster ned fil %li av %li med %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Rundt %li minutter gjenstår" @@ -530,23 +538,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Vil du erstatte konfigurasjonsfilen\n" "'%s?'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Kommandoen 'diff' ble ikke funnet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "En uopprettelig feil oppsto" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -560,28 +574,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pakke vil bli fjernet." msgstr[1] "%s pakker vil bli fjernet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s pakke vil bli installert." msgstr[1] "%s pakker vil bli installert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakke vil bli oppgradert." msgstr[1] "%s pakker vil bli oppgradert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -589,7 +603,7 @@ msgid "" "You have to download a total of %s. " msgstr "Du må laste ned totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -598,31 +612,34 @@ msgstr "" "Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere " "tidspunkt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "For å forhindre tap av data bør du lukke alle åpne programmer og dokumenter." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Kunne ikke finne noen oppgraderinger" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Systemet ditt er oppdatert!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Systemet ditt er allerede oppgradert." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Fjern %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installér %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Oppgradér %s" @@ -656,11 +673,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Omstart er nødvendig" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -698,10 +715,8 @@ msgid "Start the upgrade?" msgstr "Vil du starte oppgraderingen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Oppgraderer til Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -827,9 +842,10 @@ msgid "Verfication failed" msgstr "Verifisering feilet" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Verifisering av oppgraderingen feilet. Det kan være en feil med nettverket " "eller med tjeneren. " @@ -856,16 +872,16 @@ msgstr "Laster ned filen %li av %li med %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Laster ned fil %li av %li ved ukjent hastighet" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -873,134 +889,125 @@ msgstr "" "Kunne ikke laste ned listen med endringer. Vennligst kontrollér " "internettilkoblingen." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installerer oppdateringer" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Oppgrader til siste versjon av Ubuntu" +msgid "Normal updates" +msgstr "Installerer oppdateringer" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installerer oppdateringer" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Kan ikke installere alle tilgjengelige oppdateringer." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Laster ned listen med endringer..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Sjekk" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Nedlastingsstørrelse: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Systemet ditt er oppdatert!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Vennligst vent, dette kan ta litt tid." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Oppdateringen er fullført" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Sjekker for tilgjengelige oppdateringer" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny versjon: %s (Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1010,17 +1017,17 @@ msgstr "" "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www." "ubuntu.com for mer informasjon om oppgradering." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Ny versjon \"%s\" er tilgjengelig" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Programvareoversikten er ødelagt." -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1043,58 +1050,67 @@ msgstr "" "under \"System\" -> \"Administrasjon\" -> \"Egenskaper for programvare\"" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Hold systemet ditt oppdatert" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Analyserer systemet\n" +"Kunne ikke søke gjennom CD\n" "\n" -"Programvareoppdateringer reparerer feil, eliminerer sikkerhetsproblemer og " -"gir deg ny funksjonalitet." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Hold systemet ditt oppdatert" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Vil du starte oppgraderingen?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Avbryt ne_dlasting" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Sjek_k" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Sjekk programvarekanalene for nye oppdateringer" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Utgivelsesinformasjon" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Vis fremdrift for enkeltfiler" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1102,32 +1118,37 @@ msgstr "" "Programvareoppdateringer fikser feil, fjerner sikkerhetshull og tilbyr ny " "funksjonalitet." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "O_ppgrader" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Oppgrader til siste versjon av Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Sjekk" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Gjenoppta oppgradering" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Skjul denne informasjonen i fremtiden" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Installerer oppdateringer" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1238,11 +1259,12 @@ msgid "_Install security updates without confirmation" msgstr "_Installer sikkerhetsoppdateringer uten bekreftelse" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1276,10 +1298,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Skriv inn hele APT-linjen for kanalen du vil legge til \n" @@ -1337,8 +1359,9 @@ msgid "Check for new distribution releases" msgstr "Se etter nye utgivelser av distribusjonen" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1359,8 +1382,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Lagrer størrelsen for update-manager-vinduet" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Lagrer ditt valg for hvorvidt endringslogger og beskrivelse av programmer " @@ -1388,213 +1412,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Oppdateringer" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Bidratt programvare" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "US eksport begrenset programvare" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Installerer oppdateringer" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Offisielt støttet" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Offisielt støttet" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Noe programvare er ikke lenger offisielt støttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1645,6 +1647,47 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter" msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel programvare" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Noe programvare er ikke lenger offisielt støttet" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Kunne ikke finne noen oppgraderinger" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Systemet ditt er allerede oppgradert." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Oppgraderer til Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Oppgrader til siste versjon av Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Kan ikke installere alle tilgjengelige oppdateringer." + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Analyserer systemet\n" +#~ "\n" +#~ "Programvareoppdateringer reparerer feil, eliminerer sikkerhetsproblemer " +#~ "og gir deg ny funksjonalitet." + +#~ msgid "Oficially supported" +#~ msgstr "Offisielt støttet" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1754,9 +1797,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "Sections" #~ msgstr "Seksjoner" -#~ msgid "Check for available updates" -#~ msgstr "Sjekker for tilgjengelige oppdateringer" - #~ msgid "Sections:" #~ msgstr "Seksjoner:" diff --git a/po/ne.po b/po/ne.po index e20b5a99..16549c06 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -134,7 +134,7 @@ msgstr "तपाईंले चयन गरेको कुञ्जि ह #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,56 +147,56 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -204,24 +204,24 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -231,15 +231,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -339,73 +339,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -415,20 +420,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "स्तरवृद्धि समाप्त" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -448,7 +453,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -481,19 +486,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -503,28 +514,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -532,37 +543,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" +msgid "Your system is up-to-date" +msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -596,11 +610,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -631,7 +645,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -756,8 +770,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -781,169 +795,159 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "स्तरवृद्धिहरु स्थापना गर्दै" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "संस्करण %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, fuzzy, python-format msgid "Download size: %s" msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै" msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "स्तरवृद्धिहरु स्थापना गर्दै" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "संस्करण %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "तपाईंको वितरण समर्थित छैन" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -959,86 +963,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "परिवर्तनहरु" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "बर्णन" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "सफ्टवेयर अद्यावधिकहरु" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "परिवर्तनहरु" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1154,10 +1170,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1186,10 +1202,10 @@ msgstr "युआरएल:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस\n" @@ -1249,7 +1265,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1268,7 +1284,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1293,218 +1309,195 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "योगदान गरिएको सफ्टवेयर" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "नन-फ्री (बहुभर्स)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "युएस निषेधित सफ्टवेयर" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "स्तरवृद्धिहरु स्थापना गर्दै" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "कार्यालय बाट समर्थित" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "कार्यालय बाट समर्थित" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "कार्यालय बाट समर्थित" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "निषेधित प्रतिलिपि अधिकार" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" @@ -1557,6 +1550,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Your system has already been upgraded." +#~ msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "कार्यालय बाट समर्थित" + #, fuzzy #~ msgid "The following updates will be skipped:" #~ msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन" diff --git a/po/nl.po b/po/nl.po index 3979d843..7906b6d5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" @@ -131,9 +131,9 @@ msgstr "" "fout te melden." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -149,11 +149,11 @@ msgstr "Geef het cd-schijfje een naam" msgid "Please insert a disc in the drive:" msgstr "Plaats een schijf in de speler:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Niet-werkende pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,23 +162,23 @@ msgstr "" "met deze software. Repareer deze eerst met synaptic of apt-get voordat u " "verder gaat." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan de vereiste meta-pakketten niet upgraden." -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kan de vereisten voor de upgrade niet berekenen" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -187,11 +187,11 @@ msgstr "" "Gelieve dit als fout te rapporteren. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Fout bij het bepalen van de echtheid van sommige pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Kan '%s' niet installeren" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -216,15 +216,16 @@ msgstr "" "fout te rapporteren. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Kan het meta-pakket niet raden" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -235,12 +236,12 @@ msgstr "" "Installeer eerst één van de bovenstaande pakketten met Synaptic of apt-get " "voordat u verder gaat." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Ophalen is mislukt" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -250,15 +251,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Tijdelijke opslag inlezen" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -266,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Geen geldige mirror-server gevonden" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -291,11 +292,11 @@ msgstr "" "Wanneer u 'Nee' kiest, zal de update worden geannuleerd." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "De standaard bronnenlijst genereren?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -309,11 +310,11 @@ msgstr "" "Moeten de standaardregels voor '%s' worden toegevoegd? Wanneer u 'Nee' " "kiest, zal de update worden geannuleerd." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "De informatie over de pakketbronnen is ongeldig" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -321,13 +322,14 @@ msgstr "" "Het upgraden van de informatie over de pakketbronnen heeft het bestand " "ongeldig gemaakt. Rapporteer dit als een fout." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Pakketbronnen van derden uitgeschakeld" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -335,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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Fout tijdens het updaten" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -347,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Niet genoeg vrije schijfruimte" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -363,15 +365,15 @@ msgstr "" "vorige installaties via 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Wilt u beginnen met de upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Kon de upgrades niet installeren" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -384,11 +386,11 @@ msgstr "" "onbruikbare toestand. Er is een hersteloperatie uitgevoerd (dpkg --configure " "-a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Kon de upgrades niet downloaden" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -396,17 +398,18 @@ msgstr "" "De upgrade wordt nu afgebroken. Controleer uw internetverbinding of het " "installatiemedium en probeer opnieuw. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Bepaalde software wordt niet meer officieel ondersteund" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "worden door de gemeenschap beheerd ('universe').\n" @@ -414,23 +417,23 @@ msgstr "" "Indien 'universe' niet geactiveerd is zal bij de volgende stap gevraagd " "worden om deze pakketten te verwijderen. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Overbodige pakketten verwijderen?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Deze stap overslaan" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Verwijderen" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Fout bij het toepassen" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -439,26 +442,31 @@ msgstr "" "voor meer informatie. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "De oorspronkelijke toestand wordt hersteld" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Pakkettenbeheer controleren" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Updaten van de informatie over de pakketbronnen" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Ongeldige pakketinformatie" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -471,19 +479,19 @@ msgstr "" "meer gevonden worden.\n" "Dit is een ernstige fout, die gerapporteerd moet worden." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Vragen om bevestiging" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Bezig met upgraden" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Zoeken naar overbodige software" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Systeemupgrade is voltooid." @@ -504,7 +512,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Downloaden van bestand %li uit %li met %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Ongeveer %li minuten resterend" @@ -534,23 +542,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Het configuratiebestand vervangen?\n" "'%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "De opdracht 'diff' is niet gevonden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Er is een ernstige fout ontstaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -566,28 +580,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Er zal %s pakket verwijderd worden." msgstr[1] "Er zullen %s pakketten verwijderd worden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Er zal %s nieuw pakket geïnstalleerd worden." msgstr[1] "Er zullen %s nieuwe pakketten geïnstalleerd worden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakket zal een upgrade krijgen" msgstr[1] "%s pakketten zullen een upgrade krijgen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -595,7 +609,7 @@ msgid "" "You have to download a total of %s. " msgstr "U moet in totaal %s downloaden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -604,32 +618,35 @@ msgstr "" "Het upgraden kan enkele uren in beslag nemen en kan tussentijds niet worden " "afgebroken." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Sluit alle openstaande toepassingen en documenten om dataverlies te " "voorkomen." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Kon geen upgrades vinden" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Uw systeem is up-to-date" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Uw systeem heeft al een upgrade gekregen" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "%s verwijderen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s installeren" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s upgraden" @@ -663,11 +680,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "De computer moet opnieuw opgestart worden" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -703,11 +720,8 @@ msgid "Start the upgrade?" msgstr "Upgrade starten?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Bezig met upgraden naar Ubuntu 6.06 " -"LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -832,9 +846,10 @@ msgid "Verfication failed" msgstr "Verificatie is mislukt" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Het verifiëren van de upgrade is mislukt. Er is mogelijk een probleem met " "het netwerk of de server. " @@ -861,20 +876,20 @@ msgstr "Downloaden van bestand %li uit %li met %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Downloaden van bestand %li uit %li, snelheid onbekend" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. " "Probeer het later nog eens." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. " "Probeer het later nog eens." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -882,134 +897,125 @@ msgstr "" "Kon de lijst met wijzigingen niet downloaden. Controleer uw " "internetverbinding." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 veiligheidsupdates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Up_dates installeren" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Upgrade naar de nieuwste versie van Ubuntu" +msgid "Normal updates" +msgstr "Up_dates installeren" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Up_dates installeren" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Kan de beschikbare updates niet installeren" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versie %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Het overzicht van de wijzigingen wordt gedownload..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Controleren" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Downloadgrootte: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Uw systeem is up-to-date" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Een ogenblik geduld, dit kan even duren." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "De update is voltooid" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Up_dates installeren" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nieuwe versie: %s (Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versie %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Uw distributie wordt niet langer ondersteund" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1025,17 @@ msgstr "" "upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu." "com voor meer informatie over upgraden." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Software-index is beschadigd" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1052,58 +1058,67 @@ msgstr "" "configureren in \"Systeem\" -> \"Beheer\" -> \"Software-eigenschappen\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Uw system wordt gecontroleerd\n" -"\n" -"Software-updates repareren fouten, verhelpen veiligheidsproblemen en leveren " -"nieuwe mogelijkheden." - -#: ../data/glade/UpdateManager.glade.h:7 msgid "Keep your system up-to-date" msgstr "Houd uw systeem up-to-date" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" +msgstr "" +"Fout tijdens het lezen van de cd↵\n" +"↵\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Upgrade starten?" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Download _annuleren" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Wijzigingen" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Controleren" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Controleer de softwarekanalen op nieuwe updates" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Omschrijving" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Versie-informatie" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Voortgang tonen van individuele pakketten" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software-updates" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1111,32 +1126,37 @@ msgstr "" "Software-updates repareren fouten, verhelpen veiligheidsproblemen en leveren " "nieuwe mogelijkheden." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "U_pgraden" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade naar de nieuwste versie van Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Controleren" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Upgrade hervatten" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Deze informatie in het vervolg niet meer tonen" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Up_dates installeren" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Wijzigingen" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1246,11 +1266,12 @@ msgid "_Install security updates without confirmation" msgstr "_Veiligheids-updates zonder te vragen installeren" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1284,10 +1305,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Voer de volledige APT-regel in van het kanaal dat u wilt toevoegenUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Bezig met upgraden naar Ubuntu " +#~ "6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 veiligheidsupdates" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Upgrade naar de nieuwste versie van Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Kan de beschikbare updates niet installeren" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Uw system wordt gecontroleerd\n" +#~ "\n" +#~ "Software-updates repareren fouten, verhelpen veiligheidsproblemen en " +#~ "leveren nieuwe mogelijkheden." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officieel ondersteund" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/no.po b/po/no.po index dbe32eff..0ce223e5 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -134,7 +134,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,33 +147,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -206,24 +206,24 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -233,15 +233,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Feil under fjerning av nøkkel" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -341,73 +341,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -417,21 +422,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -451,7 +456,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -484,19 +489,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -506,28 +517,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -535,37 +546,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "Systemet har ødelagte pakker!" +msgid "Your system is up-to-date" +msgstr "Systemet er helt oppdatert!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, fuzzy, python-format msgid "Remove %s" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, fuzzy, python-format msgid "Install %s" msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Oppgradering fullført" @@ -599,11 +613,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -634,7 +648,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -761,8 +775,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -786,169 +800,159 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Det er en ny versjon av Ubuntu tilgjengelig!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Installerer oppdateringer..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, fuzzy, python-format msgid "Download size: %s" msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Systemet er helt oppdatert!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Installerer oppdateringer..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -964,86 +968,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Installerer oppdateringer..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1158,10 +1174,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1190,10 +1206,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Skriv inn hele APT-linjen til arkivet du vil legge til \n" @@ -1253,7 +1269,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1272,7 +1288,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1297,217 +1313,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Bidratt programvare" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "US eksport begrenset programvare" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Installerer oppdateringer..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Offisielt støttet" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Offisielt støttet" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Offisielt støttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Updates" @@ -1561,6 +1554,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Your system has already been upgraded." +#~ msgstr "Systemet har ødelagte pakker!" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Security Updates" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Offisielt støttet" + #, fuzzy #~ msgid "The following updates will be skipped:" #~ msgstr "De følgende pakkene er ikke oppgradert:" diff --git a/po/oc.po b/po/oc.po index c62d7e82..f9e0acb8 100644 --- a/po/oc.po +++ b/po/oc.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" @@ -131,9 +131,9 @@ msgstr "" "Avem pas poscut suprimir la clau qu'avètz seleccionada. Raportatz l'anomalia." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -149,79 +149,79 @@ msgstr "Picatz un nom pel disc" msgid "Please insert a disc in the drive:" msgstr "Metètz un disc dins lo legidor :" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paquetatges corromputs" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossible calcular la mesa a jorn" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Impossible installar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -231,15 +231,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Error al moment de metre a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Pas pro d'espaci liure" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Volètz començar la mesa a jorn ?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Impossible installar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -338,72 +338,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Impossible descargar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Suprimir" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -413,19 +418,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Mesa a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "La mesa a jorn del sistèma es acabada." @@ -445,7 +450,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -477,19 +482,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -499,28 +510,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -528,36 +539,39 @@ msgid "" "You have to download a total of %s. " msgstr "Debètz telecargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Suprimir %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Metre a jorn %s" @@ -591,11 +605,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -626,7 +640,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -748,8 +762,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -772,164 +786,154 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Metre a jorn Ubuntu" +msgid "Normal updates" +msgstr "Mesas a jorn per internet" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Mesas a jorn per internet" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Verificar" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Talha de la descarga : %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Mesas a jorn per internet" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -945,85 +949,105 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" +"Error a moment d'examinar lo CD\n" +"\n" +"%s" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "" +"Error a moment d'examinar lo CD\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambis" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descripcion" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Cambis" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1130,10 +1154,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1160,10 +1184,10 @@ msgstr "URI :" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1213,7 +1237,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1232,7 +1256,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1257,206 +1281,186 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Pas liure (multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Pas liure (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Pas liure (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Pas liure (multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1506,6 +1510,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Metre a jorn Ubuntu" + #~ msgid "Keys" #~ msgstr "Claus" diff --git a/po/pa.po b/po/pa.po index 14d8ece1..9d50e996 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -131,7 +131,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -144,79 +144,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -226,15 +226,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -333,72 +333,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -408,20 +413,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -441,7 +446,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -473,19 +478,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -495,28 +506,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -524,36 +535,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -587,11 +601,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -622,7 +636,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -746,8 +760,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -771,164 +785,155 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -944,87 +949,100 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "Software Updates" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1134,10 +1152,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1168,10 +1186,10 @@ msgstr "ਵੇਰਵਾ" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1221,7 +1239,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1241,7 +1259,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1265,194 +1283,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1502,6 +1498,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" + #, fuzzy #~ msgid "Hide details" #~ msgstr "ਵੇਰਵਾ" diff --git a/po/pl.po b/po/pl.po index d82309de..d1f49bbb 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Polish \n" @@ -130,9 +130,9 @@ 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 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Proszę podać nazwę dla płyty" msgid "Please insert a disc in the drive:" msgstr "Proszę włożyć płytę do napędu:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Uszkodzone pakiety" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,23 +161,23 @@ msgstr "" "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub " "apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nie można zaktualizować wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,11 +186,11 @@ msgstr "" "zgłosić to jako błąd. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Błąd podczas uwierzytelniania niektórych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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,27 +200,28 @@ msgstr "" "sieci. Można spróbować ponownie później. Poniżej znajduje się lista " "nieuwierzytelnionych pakietów." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nie można zainstalować \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 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:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -228,12 +229,12 @@ msgstr "" "edubuntu-desktop. Nie jest możliwe określenie używanej wersji Ubuntu.\n" " Przed kontynuowaniem proszę zainstalować jeden z powyższych pakietów." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Pobranie nie powiodło się" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -243,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Odczytywanie bufora podręcznego" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nie odnaleziono poprawnego serwera lustrzanego" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -283,11 +284,11 @@ msgstr "" "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Wygenerować domyślne źródła?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -301,11 +302,11 @@ msgstr "" "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" " "aktualizacja zostanie anulowana." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Błędne informacje o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -313,13 +314,14 @@ msgstr "" "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę " "zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Źródła stron niezależnych zostały wyłączone" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -327,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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Błąd podczas aktualizacji" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -339,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Zbyt mało miejsca na dysku" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -355,15 +357,15 @@ msgstr "" "\"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Czy chcesz rozpocząć aktualizację?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem." -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -376,11 +378,11 @@ msgstr "" "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Pobranie aktualizacji było niemożliwe" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -388,17 +390,18 @@ msgstr "" "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz " "dysk instalacyjny i spróbować ponownie. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Niektóre programy nie są już oficjalnie wspierane" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "obsługiwane przez społeczność (\"universe\").\n" @@ -406,23 +409,23 @@ msgstr "" "Jeśli nie masz włączonego \"universe\" w następnym kroku zostanie " "zasugerowane ich usunięcie. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Usunąć niepotrzebne pakiety?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Pomiń ten krok" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Usuń" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Błąd podczas zatwierdzania" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -431,26 +434,31 @@ msgstr "" "poniższych wiadomościach. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Przywracanie pierwotnego stanu systemu" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Sprawdzanie menedżera pakietów" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aktualizowanie informacji o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Błędne informacje o pakietach" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -463,19 +471,19 @@ msgstr "" "być odnaleziony.\n" "To wskazuje na poważny problem, proszę zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Pytanie o potwierdzenie" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Aktualizacja w toku" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Aktualizacja systemu zakończona powodzeniem." @@ -496,7 +504,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Pobieranie pliku %li z %li z prędkością %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Około %li minut pozostało" @@ -526,23 +534,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Zastąpić plik konfiguracyjny\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Polecenie \"diff\" nie zostało odnalezione" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Wystąpił błąd krytyczny" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -557,31 +571,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pakiet zostanie usunięty." msgstr[1] "%s pakiety zostaną usunięte." msgstr[2] "%s pakietów zostanie usuniętych." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nowy pakiet zostanie zainstalowany." msgstr[1] "%s nowe pakiety zostaną zainstalowane." msgstr[2] "%s nowy pakietów zostanie zainstalowane." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakiet zostanie zaktualizowany." msgstr[1] "%s pakiety zostaną zaktualizowane." msgstr[2] "%s pakietów zostanie zaktualizowanych." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -589,7 +603,7 @@ msgid "" "You have to download a total of %s. " msgstr "Konieczne pobranie ogółem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -597,32 +611,35 @@ msgid "" msgstr "" "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i " "dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nie odnaleziono żadnych aktualizacji" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Twój system jest w pełni zaktualizowany" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "System został już zaktualizowany." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Usuń %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instaluj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Aktualizuj %s" @@ -656,11 +673,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Wymagane ponowne uruchomienie komputera" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -698,10 +715,8 @@ msgid "Start the upgrade?" msgstr "Rozpocząć aktualizację?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Aktualizacja do Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -825,9 +840,10 @@ msgid "Verfication failed" msgstr "Weryfikacja nie powiodła się" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Weryfikacja aktualizacji nie powiodła się. To może być problem sieciowy lub " "z serwerem. " @@ -854,16 +870,16 @@ msgstr "Pobieranie pliku %li z %li z prędkością %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -871,99 +887,85 @@ msgstr "" "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić połączenie z " "Internetem." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instalowanie pakietów" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Zaktualizuj do najnowszej wersji Ubuntu" +msgid "Normal updates" +msgstr "Instalowanie pakietów" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instalowanie pakietów" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Wersja %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Pobieranie informacji o zmianach..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Sp_rawdź" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Rozmiar do pobrania: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Twój system jest w pełni zaktualizowany" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -971,35 +973,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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Proszę czekać, to może chwilę potrwać." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aktualizacja została ukończona." -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Sprawdź dostępne aktualizacje" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nowa wersja: %s (Rozmiar: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Wersja %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Twoja dystrybucja nie jest już wspierana" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1016,17 @@ msgstr "" "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. " "Odwiedź http://www.ubuntu.com po więcej informacji." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Spis oprogramowania jest uszkodzony" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1043,58 +1050,67 @@ msgstr "" "\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Utrzymuj system w pełni zaktualizowany" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Sprawdzanie systemu\n" +"Błąd podczas przeszukiwania płyty CD\n" "\n" -"Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " -"bezpieczeństwa i dostarczyć nowe funkcje." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Utrzymuj system w pełni zaktualizowany" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Rozpocząć aktualizację?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "_Przerwij pobieranie" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Zmiany" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Sp_rawdź" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Sprawdź kanały oprogramowania w poszukiwaniu nowych aktualizacji" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Opis" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Informacje o wydaniu" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Pokaż postęp pobierania poszczególnych plików" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Aktualizacje oprogramowania" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1102,32 +1118,37 @@ msgstr "" "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " "bezpieczeństwa i dostarczyć nowe funkcje." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Aktualizuj" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Zaktualizuj do najnowszej wersji Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Sp_rawdź" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Wznów aktualizację" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Ukryj tę informację w przyszłości" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instaluj aktualizacje" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Zmiany" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1238,11 +1259,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instaluj aktualizacje bezpieczeństwa bez potwierdzania" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1276,10 +1298,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Wpisz pełny wiersz APT opisujący kanał który chcesz dodać\n" @@ -1338,8 +1360,9 @@ msgid "Check for new distribution releases" msgstr "Sprawdzaj nowe wydania dystrybucji" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1360,8 +1383,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Zapamiętuje rozmiar okna Menedżera aktualizacji" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Zapamiętuje stan obszaru z listą zmian i opisem poszczególnych aktualizacji" @@ -1388,212 +1412,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Aktualizacje dla Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Inne oprogramowanie (Contributed)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Nie-wolnodostępne (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Instalowanie pakietów" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Wspierane oficjalnie" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Wspierane oficjalnie" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Niektóre programy nie są już oficjalnie wspierane" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "O ograniczonych prawach kopiowania" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" @@ -1644,6 +1646,47 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free" msgid "Non-DFSG-compatible Software" msgstr "Oprogramowanie niekompatybilne z DFSG." +#~ msgid "Some software no longer officially supported" +#~ msgstr "Niektóre programy nie są już oficjalnie wspierane" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Nie odnaleziono żadnych aktualizacji" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "System został już zaktualizowany." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Aktualizacja do Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Zaktualizuj do najnowszej wersji Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Sprawdzanie systemu\n" +#~ "\n" +#~ "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe " +#~ "punkty bezpieczeństwa i dostarczyć nowe funkcje." + +#~ msgid "Oficially supported" +#~ msgstr "Wspierane oficjalnie" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1755,9 +1798,6 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "Sections" #~ msgstr "Sekcje:" -#~ msgid "Check for available updates" -#~ msgstr "Sprawdź dostępne aktualizacje" - #~ msgid "Sections:" #~ msgstr "Sekcje:" diff --git a/po/pt.po b/po/pt.po index 9c701587..dc4e9a6a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho \n" "Language-Team: Ubuntu Portuguese Team \n" @@ -129,9 +129,9 @@ msgstr "" "A chave que seleccionou não pôde ser removida. Por favor reporte este erro." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Por favor introduza um nome para o disco" msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pacotes Quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "este software. Por favor corrija-os usando o synaptic ou apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível actualizar os meta-pacotes necessários" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossível de calcular a actualização" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "reporte este erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Impossível de instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,15 +212,16 @@ msgstr "" "Foi impossível instalar um pacote essencial. Por favor reporte este erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Impossível de descobrir meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" " Por favor instale um dos pacotes acima mencionados usando o synaptic ou apt-" "get antes de continuar." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Falha a obter" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "A ler a cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrada" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +287,11 @@ msgstr "" "Se escolher \"não\" a actualização irá ser cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Gerar as fontes padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -304,11 +305,11 @@ msgstr "" "Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a " "actualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -316,13 +317,14 @@ msgstr "" "A actualização da informação de repositório resultou num ficheiro inválido. " "Por favor reporte este erro." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Fontes de terceiros desactivadas" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -330,11 +332,11 @@ msgstr "" "reactivá-las depois da actualização com a ferramenta 'propriedades-software' " "ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Erro durante a actualização" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -343,11 +345,11 @@ msgstr "" "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a " "tentar." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Não existe espaço livre em disco suficiente" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +361,15 @@ msgstr "" "usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Deseja iniciar a actualização?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Impossível de instalar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Impossível de descarregar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -391,17 +393,18 @@ 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:488 -msgid "Some software no longer officially supported" -msgstr "Algum software já não é suportado oficialmente" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "apenas suportados pela comunidade ('universe').\n" @@ -409,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:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Saltar Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Erro ao submeter" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,27 +437,32 @@ msgstr "" "abaixo para mais informação. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "A restaurar o estado original do sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "A verificar gestor de pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "A Actualizar informação de repositórios" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Informação de pacotes inválida" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +475,19 @@ msgstr "" "pacote essencial '%s'.\n" "Isto indica um erro sério, por favor reporte este problema." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "A pedir confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "A actualizar" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "À procura de software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "A actualização do sistema está completa." @@ -500,7 +508,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "A descarregar ficheiro %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Cerca de %li minutos restantes" @@ -530,23 +538,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Substituir ficheiro de configuração\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -561,28 +575,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pacote será actualizado." msgstr[1] "%s pacotes serão actualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -590,7 +604,7 @@ msgid "" "You have to download a total of %s. " msgstr "Tem de efectuar o download de um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -599,32 +613,35 @@ msgstr "" "A actualização poderá demorar várias horas e não poderá ser cancelada a " "qualquer instante posteriormente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir a perda de dados feche todas as aplicações e documentos " "abertos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Impossível de encontrar quaisquer actualizações" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "O seu sistema está actualizado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "O seu sistema já foi actualizado." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Remover %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" @@ -658,11 +675,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Necessário reiniciar" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -698,11 +715,8 @@ msgid "Start the upgrade?" msgstr "Iniciar a actualização?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"A actualizar para Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -826,9 +840,10 @@ msgid "Verfication failed" msgstr "Falhou a verificação" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Verificação da actualização falhou. Poderá existir um problema com a rede ou " "com o servidor. " @@ -855,18 +870,18 @@ msgstr "A descarregar ficheiro %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "A lista de alterações ainda não está disponível. Por favor tente mais tarde." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "A lista de alterações ainda não está disponível. Por favor tente mais tarde." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -874,134 +889,125 @@ msgstr "" "Falha a descarregar a lista de alterações. Por favor verifique a sua ligação " "à internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "A instalar actualizações" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Actualize para a última versão do Ubuntu" +msgid "Normal updates" +msgstr "A instalar actualizações" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "A instalar actualizações" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Impossível de instalar todas as actualizações disponíveis" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versão %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "A descarregar lista de alterações..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Verificar" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "O seu sistema está actualizado" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Por favor aguarde, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "A actualização está completa" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Verificar por actualizações disponíveis" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nova versão: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versão %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "A sua distribuição já não é suportada" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1017,17 @@ msgstr "" "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais " "informação em como actualizar." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "O índice de software está quebrado" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,58 +1051,67 @@ msgstr "" "Software\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Mantenha o seu sistema actualizado" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"A examinar o seu sistema\n" +"Erro ao ler o CD\n" "\n" -"Actualizações de software podem corrigir erros, eliminar problemas de " -"segurança, e fornecer novas funcionalidades." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Mantenha o seu sistema actualizado" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Iniciar a actualização?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancelar _Descarregamento" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Alterações" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Verific_ar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Verificar os repositórios de software por novas actualizações" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrição" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de lançamento" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Mostrar progresso de ficheiros individuais" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualizações de Software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1104,32 +1119,37 @@ msgstr "" "Actualizações de software podem corrigir erros, eliminar problemas de " "segurança, e fornecer novas funcionalidades." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "A_ctualização" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualize para a última versão do Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Retomar Actualização?" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instalar Actualizações" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Alterações" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1239,11 +1259,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instalar actualizações de segurança sem confirmação" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1278,10 +1299,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Introduza uma linha completa APT para o repositório que deseja " @@ -1339,8 +1360,9 @@ msgid "Check for new distribution releases" msgstr "Verificar por novos lançamentos de distribuições" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1361,8 +1383,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Guarda o tamanho do diálogo do gestor de actualizações" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Guarda o estado da lista que contém a lista de alterações e a descrição" @@ -1389,212 +1412,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Actualizações" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Mantido pela comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Não-livre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantido pela comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Mantido pela comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Actualizações de Segurança" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "A instalar actualizações" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Suportado Oficialmente" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Suportado Oficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantido pela comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Algum software já não é suportado oficialmente" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Direitos de autor restritos" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1645,6 +1646,47 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres" msgid "Non-DFSG-compatible Software" msgstr "Software compatível-DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Algum software já não é suportado oficialmente" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Impossível de encontrar quaisquer actualizações" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "O seu sistema já foi actualizado." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "A actualizar para Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Actualizações de Segurança" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Actualize para a última versão do Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Impossível de instalar todas as actualizações disponíveis" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "A examinar o seu sistema\n" +#~ "\n" +#~ "Actualizações de software podem corrigir erros, eliminar problemas de " +#~ "segurança, e fornecer novas funcionalidades." + +#~ msgid "Oficially supported" +#~ msgstr "Suportado Oficialmente" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1745,9 +1787,6 @@ msgstr "Software compatível-DFSG" #~ msgid "Sections" #~ msgstr "Secções" -#~ msgid "Check for available updates" -#~ msgstr "Verificar por actualizações disponíveis" - #~ msgid "Sections:" #~ msgstr "Secções:" diff --git a/po/pt_BR.po b/po/pt_BR.po index 57131852..2a927beb 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-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut \n" "Language-Team: Ubuntu-BR \n" @@ -133,9 +133,9 @@ msgstr "" "como um erro." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "Por favor digite um nome para o disco" msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pacotes quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,23 +164,23 @@ msgstr "" "programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes " "de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível atualizar os meta-pacotes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -189,11 +189,11 @@ msgstr "" "favor reporte isto como um erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,15 +217,16 @@ msgstr "" "um erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Não foi possível adivinhar o meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -235,12 +236,12 @@ msgstr "" "Por favor instale um desses pacotes primeiro usando o Synaptic ou apt-get " "antes de continuar." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Falha ao obter" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -250,15 +251,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Lendo cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -266,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrado" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -290,11 +291,11 @@ msgstr "" "Se você selecionar 'não' a atualização será cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Gerar sources padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -308,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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -320,13 +321,14 @@ msgstr "" "Atualizando a informações de repositórios resultou em um arquivo inválido. " "Por favor reporte isso como um erro." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Fontes de terceiros desabilitadas" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -334,11 +336,11 @@ msgstr "" "poderá reabilitá-las depois de atualizar com a ferramenta 'propriedades do " "programa' ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Erro durante a atualização" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -347,11 +349,11 @@ msgstr "" "problemas de rede, por favor verifique a sua conexão de rede e tente " "novamente." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Não há espaço suficiente no disco" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -363,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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Você quer iniciar a atualização?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Não foi possível instalar as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -383,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Não foi possível obter as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -395,17 +397,18 @@ 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:488 -msgid "Some software no longer officially supported" -msgstr "Alguns softwares não são mais oficialmente suportado." +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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 " "são suportados somente pela comunidade ('universe').\n" @@ -413,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:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Pular Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Erro ao aplicar as mudanças" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -438,27 +441,32 @@ msgstr "" "abaixo para maiores informações. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Reiniciando o estado original do sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Verificando o Gerenciador de Pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 #, fuzzy msgid "Invalid package information" msgstr "Informação do pacote inválida" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -471,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:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Pedindi por confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Atualizando" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "A Atualização do Sistema está completa." @@ -504,7 +512,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Obtendo arquivo %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Aproximadamente %li minutos restando" @@ -534,23 +542,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Substituir arquivo de configuração\n" "'%s' ?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -565,28 +579,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pacote será atualizado." msgstr[1] "%s pacotes serão atualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -594,7 +608,7 @@ msgid "" "You have to download a total of %s. " msgstr "Você precisa obter um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -602,30 +616,33 @@ msgid "" msgstr "" "A atualização pode levar diversas horas e não poderá ser cancelada depois." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Para evitar perda de dados, feche todas as aplicações e documentos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Não foi possível encontrar nenhuma atualização" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Seu sistema está atualizado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Seu sistema já foi atualizado." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Remover %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Atualizar %s" @@ -659,11 +676,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Reinicialização requerida" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -700,11 +717,8 @@ msgid "Start the upgrade?" msgstr "Iniciar a Atualização?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Atualizando para o Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -829,9 +843,10 @@ msgid "Verfication failed" msgstr "Falha na verificação" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Falha na verificação da atualização. Pode ter havido um problema com a rede " "ou com o servidor. " @@ -858,20 +873,20 @@ msgstr "Obtendo arquivo %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "A lista de alterações não está disponível ainda. Por favor, tente novamente " "mais tarde." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "A lista de alterações não está disponível ainda. Por favor, tente novamente " "mais tarde." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -879,134 +894,125 @@ msgstr "" "Não foi possível baixar a lista de mudanças. Por favor, verifique sua " "conexão com a internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instalando Atualizações" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Atualizar para a última versão do Ubuntu" +msgid "Normal updates" +msgstr "Instalando Atualizações" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instalando Atualizações" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Não foi possível instalar todas as atualizações disponíveis" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Obtendo a lista de alterações" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Verificar" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Seu sistema está atualizado" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Por favor, espere, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Atualização completa" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Procurar updates disponíveis" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "New version: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Sua distribuição não é mais suportada" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1022,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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "A índex de software está quebrado" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1050,58 +1056,67 @@ msgstr "" "de Programas\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Manter o Sistema Atualizado" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Verificando as Atualizações Disponíveis\n" +"Erro analisando o CD\n" "\n" -"Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " -"segurança, e prover novas funcionalidades para você." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Manter o Sistema Atualizado" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Iniciar a Atualização?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancelar _Download" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Mudanças" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Verificar os canais de software por novas atualizações" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrição" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de Versão" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Exibir progresso de arquivos únicos" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Atualizações de Programas" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1109,33 +1124,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:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "At_ualizar" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atualizar para a última versão do Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Continua_r Atualização" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instalar Atualizações" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Mudanças" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1247,11 +1267,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instalar novas atualizações de segurança sem confirmação" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1285,10 +1306,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Insira a linha completa do APT do canal que você quer adicionarUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Atualizando para o Ubuntu 6.06 " +#~ "LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Atualizações de Segurança do Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Atualizar para a última versão do Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Não foi possível instalar todas as atualizações disponíveis" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Verificando as Atualizações Disponíveis\n" +#~ "\n" +#~ "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades " +#~ "de segurança, e prover novas funcionalidades para você." + +#~ msgid "Oficially supported" +#~ msgstr "Suportado Oficialmente" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1765,9 +1807,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "Sections" #~ msgstr "Seções" -#~ msgid "Check for available updates" -#~ msgstr "Procurar updates disponíveis" - #~ msgid "Sections:" #~ msgstr "Sections:" diff --git a/po/ro.po b/po/ro.po index e4231744..32441a57 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" @@ -135,9 +135,9 @@ 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 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -153,12 +153,12 @@ msgstr "Introduceţi un nume pentru disc" msgid "Please insert a disc in the drive:" msgstr "Introduceţi un disc în unitate:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 #, fuzzy msgid "Broken packages" msgstr "Pachete deteriorate" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 #, fuzzy msgid "" "Your system contains broken packages that couldn't be fixed with this " @@ -168,46 +168,46 @@ msgstr "" "program. Înainte de a continua vă rugăm să le remediaţi utilizând synaptic " "sau apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 #, fuzzy msgid "Error authenticating some packages" msgstr "Eroare la autentificarea unor pachete." -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nu pot instala '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -217,25 +217,29 @@ msgstr "" "(eroare). " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" +"Sistemul conţine pachete deteriorate care nu au putut fi reparate cu acest " +"program. Înainte de a continua vă rugăm să le remediaţi utilizând synaptic " +"sau apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Nu s-a putut extrage" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +249,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Citire cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -278,11 +282,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -291,42 +295,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Eroare în timpul actualizării" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Spaţiu liber insuficient" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -335,15 +339,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Vrei sa începi upgrade-ul?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nu s-au putut instalat upgrade-urile" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -352,73 +356,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nu pot descărca actualizările" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "Şter_ge" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "Se reface starea iniţială a sistemului" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Se verifică managerul de pachete" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -428,19 +437,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Se actualizează" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Actualizarea sistemului este completă" @@ -460,7 +469,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -492,19 +501,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -514,31 +529,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -546,36 +558,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nu s-au găsit actualizări" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "Sistemul dumneavoastră este actualizat la zi!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -609,11 +624,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -644,7 +659,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -768,8 +783,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -792,16 +807,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Nu există nici un pachet de actualizat." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -810,100 +825,85 @@ msgstr "" "Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o " "conexiune internet activă." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Actualizări de Securitate Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Instalează actualizarile" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Se actualizează Ubuntu" +msgid "Normal updates" +msgstr "_Instalează actualizarile" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Instalează actualizarile" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versiunea %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Se descarcă listă schimbărilor..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Sistemul dumneavoastră este actualizat la zi!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -911,53 +911,58 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Instalează actualizarile" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versiunea nouă: %s (Mărime: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versiunea %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Distribuţia dvs. nu mai este suportată" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -973,87 +978,108 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" +"Eroare la scanarea CD-ului\n" +"\n" +"%s" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "" +"Eroare la scanarea CD-ului\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Modificări" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descriere" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualizări software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "_Actualizează" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Continuă Actualizarea" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "_Instalează actualizarile" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Modificări" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1166,10 +1192,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1197,10 +1223,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Introduceţi linia APT completă a locaţiei pe care doriţi să o " @@ -1265,7 +1291,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1284,7 +1310,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1309,214 +1335,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualizări Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Software în contribuţie" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Pachete non-libere (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Pachete non-libere (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Software cu restricţii de export din SUA" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Actualizări de Securitate Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Instalează actualizarile" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Pachete suportate oficial" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizări de securitate Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Pachete suportate oficial" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Pachete non-libere (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Pachete suportate oficial" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restrictiv" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizări de securitate Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" @@ -1567,6 +1570,24 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Could not find any upgrades" +#~ msgstr "Nu s-au găsit actualizări" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Sistemul dumneavoastră este actualizat la zi!" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Actualizări de Securitate Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Se actualizează Ubuntu" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Pachete suportate oficial" + #~ msgid "Hide details" #~ msgstr "Ascunde detaliile" diff --git a/po/ru.po b/po/ru.po index 616a59c8..4b799c1e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -130,9 +130,9 @@ msgstr "" "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Введите название для диска" msgid "Please insert a disc in the drive:" msgstr "Пожалуйста, вставьте диск в привод:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Поврежденные пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,23 +161,23 @@ msgstr "" "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-get, " "прежде чем продолжить." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Невозможно обновить требуемые мета-пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Будет удален необходимый пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Невозможно подготовить обновление системы" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,11 +186,11 @@ msgstr "" "Пожалуйста, отправьте отчет об ошибке. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Ошибка при проверке подлинности некоторых пакетов" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Невозможно установить '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,15 +214,16 @@ msgstr "" "ошибке. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Невозможно подобрать мета-пакет" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -231,12 +232,12 @@ msgstr "" " Для продолжения сначала установите один из приведенных выше пакетов с " "помощью synaptic или apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Не удалось получить" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -246,15 +247,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Чтение кэша" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +263,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Не найдено действующее зеркало" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +287,11 @@ msgstr "" "Ответ 'Нет' отменит обновление." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Сгенерировать источники по умолчанию?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +304,11 @@ msgstr "" "\n" "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Информация о репозитории неверна" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,13 +316,14 @@ msgstr "" "В результате обновления информации о репозиториях образовался неверный файл. " "Пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Источники третьих сторон отключены" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -329,11 +331,11 @@ msgstr "" "обновления вы можете снова включить их с помощью утилиты 'software-" "properties' или synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Ошибка при обновлении" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -341,11 +343,11 @@ msgstr "" "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в " "сети, проверьте сетевые подключения и повторите попытку." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Недостаточно свободного места на диске" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +359,15 @@ msgstr "" "предыдущих установок с помощью команды 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Вы хотите начать обновление системы?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Невозможно установить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +379,11 @@ msgstr "" "Обновление прервано. Система, возможно, находится в неработоспособном " "состоянии. Запущено восстановление системы (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Невозможно загрузить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,17 +391,18 @@ msgstr "" "Обновление прервано. Проверьте соединение с Интернет или установочный диск и " "попробуйте снова. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Некоторые программы больше не поддерживаются официально" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Эти установленные пакеты больше не поддерживаются официально. Теперь их " "поддержкой занимается только сообщество ('universe').\n" @@ -407,23 +410,23 @@ msgstr "" "Если у вас не подключен репозиторий 'universe', на следующем шаге вам " "предложат удалить эти пакеты. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Удалить устаревшие пакеты?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Пропустить этот шаг" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Удалить" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Ошибка при фиксировании" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -432,26 +435,31 @@ msgstr "" "ниже. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Восстановление первоначального состояния системы" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Проверка менеджера пакетов" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Обновление информации о репозитории" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Неверная информация о пакете" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -464,19 +472,19 @@ msgstr "" "найден.\n" "Это говорит о серьезной проблеме, пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Запрос подтверждения" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Обновление" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Поиск устаревших программ" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Обновление системы завершено." @@ -497,7 +505,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Загрузка файла %li из %li со скоростью %s/с" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Осталось приблизительно %li минут" @@ -527,23 +535,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Заменить конфигурационный файл\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Не найдена команда 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Произошла неисправимая ошибка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -557,31 +571,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s пакет будет удален." msgstr[1] "%s пакета будут удалены." msgstr[2] "%s пакетов будут удалены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s новый пакет будет установлен." msgstr[1] "%s новых пакета будут установлены." msgstr[2] "%s новых пакетов будут установлены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s пакет будет обновлен." msgstr[1] "%s пакета будут обновлены." msgstr[2] "%s пакетов будут обновлены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -589,7 +603,7 @@ msgid "" "You have to download a total of %s. " msgstr "Всего требуется загрузить %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -598,31 +612,34 @@ msgstr "" "Обновление может занять несколько часов и не может быть прервано в любой " "момент." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Чтобы избежать потерь данных, закройте все открытые приложения и документы." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Обновления не найдены" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Ваша система не требует обновления" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Система уже обновлена." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Удалить %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Установить %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Обновить %s" @@ -656,11 +673,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Требуется перезагрузка" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Обновление завершено и требуется перезагрузка. Перезагрузиться сейчас?" @@ -695,10 +712,8 @@ msgid "Start the upgrade?" msgstr "Начать обновление?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Обновление до Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -822,9 +837,10 @@ msgid "Verfication failed" msgstr "Проверка не удалась" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Проверка обновления не удалась. Возможно, возникла проблема в сети или на " "сервере. " @@ -851,18 +867,18 @@ msgstr "Загрузка файла %li из %li со скоростью %s/с" msgid "Downloading file %li of %li with unknown speed" msgstr "Загрузка файла %li из %li с неизвестной скоростью" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -870,99 +886,85 @@ msgstr "" "Не удалось загрузить список изменений. Пожалуйста, проверьте соединение с " "интернет." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Обновления безопасности Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Установить обновления" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Обновить систему до последней версии Ubuntu" +msgid "Normal updates" +msgstr "Установить обновления" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Установить обновления" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Невозможно установить все доступные обновления" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Загрузка списка изменений..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Проверить" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Размер загружаемых данных: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Ваша система не требует обновления" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -970,35 +972,40 @@ msgstr[0] "Вы можете установить %s обновление" msgstr[1] "Вы можете установить %s обновления" msgstr[2] "Вы можете установить %s обновлений" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Пожалуйста подождите, это может занять некоторое время." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Обновление завершено" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Установить обновления" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Новая версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Ваша версия Ubuntu больше не поддерживается" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1015,17 @@ msgstr "" "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для " "получения информации об обновлении посетите http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "Доступен новый релиз дистрибутива '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Индекс программ поврежден" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,58 +1048,67 @@ msgstr "" "\"Система\" -> \"Администрирование\" -> \"Параметры приложений\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Не забывайте обновлять систему" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Обследование системы\n" +"Ошибка при сканировании CD\n" "\n" -"Обновления программ исправляют ошибки, уязвимости и добавляют новые " -"возможности." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Не забывайте обновлять систему" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Начать обновление?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Отменить _загрузку" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Изменения" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Проверить" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Проверить каналы приложений на наличие обновлений" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Описание" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Сведения о релизе" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Показывать прогресс для отдельных файлов" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Обновления программ" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1100,32 +1116,37 @@ msgstr "" "Обновления программ исправляют ошибки, уязвимости и добавляют новые " "возможности." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "Обновить" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Обновить систему до последней версии Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Проверить" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Продолжить обновление" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Не показывать эту информацию в дальнейшем" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Установить обновления" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Изменения" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1235,11 +1256,12 @@ msgid "_Install security updates without confirmation" msgstr "Устанавливать обновления безопасности без запроса" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1273,10 +1295,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Введите полную строку APT канала, который вы хотите добавитьUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Обновление до Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Обновления безопасности Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Обновить систему до последней версии Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Невозможно установить все доступные обновления" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Обследование системы\n" +#~ "\n" +#~ "Обновления программ исправляют ошибки, уязвимости и добавляют новые " +#~ "возможности." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Официально поддерживается" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/rw.po b/po/rw.po index 1eae4fdb..eecc39d9 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -142,7 +142,7 @@ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -155,56 +155,56 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -212,24 +212,24 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -239,15 +239,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "i Urufunguzo" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -347,73 +347,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Muyobozi ni" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -423,20 +428,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -456,7 +461,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -489,19 +494,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -511,25 +522,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -537,37 +548,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "Sisitemu" +msgid "Your system is up-to-date" +msgstr "Sisitemu ni Hejuru Kuri Itariki" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -601,11 +615,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -636,7 +650,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -762,8 +776,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -786,16 +800,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "ni a Gishya Bya Bihari" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -803,152 +817,142 @@ msgid "" msgstr "" "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "5" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Kwinjiza porogaramu" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Kwinjiza porogaramu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Kwinjiza porogaramu" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, fuzzy, python-format msgid "Version %s: \n" msgstr "Verisiyo \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Iyimura... i" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Sisitemu ni Hejuru Kuri Itariki" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Kwinjiza porogaramu" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verisiyo \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ikwirakwiza... ni Oya" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -964,87 +968,100 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Amahinduka" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Isobanuramiterere" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Ibihuzagihe bya porogaramumudasobwa" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "Byarangiye" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Byarangiye" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Kwinjiza porogaramu" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Amahinduka" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1155,10 +1172,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1191,10 +1208,10 @@ msgstr "Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "\n" "Language-Team: Slovak \n" @@ -130,9 +130,9 @@ 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 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Prosím, zadajte názov disku" msgid "Please insert a disc in the drive:" msgstr "Prosím, vložte disk do mechaniky:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Poškodené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ 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:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nemôžem aktualizovať požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nemôžem vypočítať aktualizáciu" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "ako chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíkov" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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,27 +199,28 @@ 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nemôžem inštalovať '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 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:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nemôžem odhadnúť meta balík." -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -228,12 +229,12 @@ msgstr "" "Pred pokračovaním nainštalujte jeden z vyššie uvedených balíkov pomocou " "Synapticu alebo apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Zlyhalo získavanie aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -243,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Čítam vyrovnávaciu pamäť cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nebol nájdený vhodný server" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -283,11 +284,11 @@ msgstr "" "Pokiaľ zvolíte 'Nie', súbor nebude zmenený." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -301,11 +302,11 @@ msgstr "" "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor " "nebude zmenený." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Neplatná informácia o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -313,13 +314,14 @@ msgstr "" "Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. " "Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Zdroje tretích strán sú zakázané" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -327,11 +329,11 @@ msgstr "" "Môžete ich povoliť po upgrade pomocou nástroja 'vlastnosti-softwaru' alebo " "pomocou synapticu." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Chyba počas aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -339,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Nedostatok voľného miesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -355,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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Chcete začať s aktualizáciou?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nebolo možné nainštalovať aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -375,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nebolo možné stiahnuť požadované balíky" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -387,17 +389,18 @@ 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:488 -msgid "Some software no longer officially supported" -msgstr "Niektoré programy už nie sú viac oficiálne podporované" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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á " "sa o ne komunita.\n" @@ -405,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:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Odstrániť zastarané balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Preskočiť tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Odstrániť" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Chyba počas potvrdzovania" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -430,26 +433,31 @@ msgstr "" "uvedené správy. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Obnovuje sa pôvodný stav systému" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Kontrola správcu balíkov" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aktualizácia informácií o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Neplatná informácia o balíku" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -462,19 +470,19 @@ msgstr "" "s'.\n" "To znamená závažný problém. Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Požaduje sa potvrdenie" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Prebieha aktualizácia" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Vyhľadávanie zastaraného softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Aktualizácia systému je dokončená." @@ -495,7 +503,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Sťahovanie súboru %li z %li pri %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Zostáva %li minút" @@ -525,23 +533,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Nahradiť konfiguračný súbor\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Príkaz 'diff' nebol nájdený." -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Nastala závažná chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -557,31 +571,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Bude odstránený %s balík." msgstr[1] "Budú odstránené %s balíky." msgstr[2] "Bude odstránených %s balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Bude nainštalovaný %s nový balík." msgstr[1] "Budú nainštalované %s nové balíky." msgstr[2] "Bude nainštalovaných %s nových balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "Bude aktualizovaný %s balík." msgstr[1] "Budú aktualizované %s balíky." msgstr[2] "Bude aktualizovaných %s balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -589,38 +603,41 @@ msgid "" "You have to download a total of %s. " msgstr "Musíte stiahnuť celkom %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pre zamedzenie straty dát, zavrite všetky otvorené programy a dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nemôžno nájsť žiadne aktualizácie" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Váš systém je aktuálny" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Váš systém už bol aktualizovaný." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Odstrániť %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Inštalovať %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Aktualizovať %s" @@ -654,11 +671,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Je potrebný reštart" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -695,11 +712,8 @@ msgid "Start the upgrade?" msgstr "Spustiť aktualizáciu?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Prebieha aktualizácia na Ubuntu 6.06 " -"LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -823,9 +837,10 @@ msgid "Verfication failed" msgstr "Zlyhala verifikácia" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Zlyhala verifikácia aktualizácie. Môže to byť spôsobené sieťovým problémom " "alebo nedostupňosťou servera. " @@ -852,16 +867,16 @@ msgstr "Sťahovanie súboru %li z %li pri %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -869,99 +884,85 @@ msgstr "" "Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové " "pripojenie." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Nainštalovať _aktualizácie" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Aktualizovať na najnovšiu verziu Ubuntu" +msgid "Normal updates" +msgstr "Nainštalovať _aktualizácie" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Nainštalovať _aktualizácie" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Verzia %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Získava sa zoznam zmien..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Skontrolovať" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Veľkosť na stiahnutie: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Váš systém je aktuálny" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -969,35 +970,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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Čakajte prosím, toto môže chvíľu trvať." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aktualizácia je dokončená" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Kontrolujem aktualizácie..." + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nová verzia: %s (veľkosť: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verzia %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Vaša distribúcia už nie je podporovaná" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1014,17 @@ msgstr "" "Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu." "com.\"" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Index softvéru je poškodený" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,58 +1048,67 @@ msgstr "" "softvéru'." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Udržujte si systém v aktuálnom stave" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Analyzuje sa váš systém\n" +"Chyba pri načítavaní CD\n" "\n" -"Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " -"zraniteľnosti alebo poskytujú nové vlastnosti." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Udržujte si systém v aktuálnom stave" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Spustiť aktualizáciu?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "_Zrušiť sťahovanie" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Zmeny" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Skontrolovať" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Skontrolovať, či zdroje softvéru neobsahujú nové aktualizácie" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Popis" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Poznámky k vydaniu" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Zobraziť priebeh jednotlivých súborov" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Aktualizácie softvéru" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1101,32 +1116,37 @@ msgstr "" "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " "zraniteľnosti alebo poskytujú nové vlastnosti." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Aktualizovať" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aktualizovať na najnovšiu verziu Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Skontrolovať" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Pokračovať v aktualizácii" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Túto správu už viac nezobrazovať" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Nainštalovať _aktualizácie" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Zmeny" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1237,11 +1257,12 @@ msgid "_Install security updates without confirmation" msgstr "_Bezpečnostné aktualizácie inštalovať automaticky bez potvrdenia" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1276,10 +1297,10 @@ msgstr "Adresa:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete pridaťUpgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Prebieha aktualizácia na Ubuntu " +#~ "6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Aktualizovať na najnovšiu verziu Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Analyzuje sa váš systém\n" +#~ "\n" +#~ "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " +#~ "zraniteľnosti alebo poskytujú nové vlastnosti." + +#~ msgid "Oficially supported" +#~ msgstr "Oficiálne podporované" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -2016,9 +2058,6 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "Updating package list..." #~ msgstr "Aktualizujem zoznam balíkov..." -#~ msgid "Checking for updates..." -#~ msgstr "Kontrolujem aktualizácie..." - #~ msgid "There are no updates available." #~ msgstr "Nie sú dostupné žiadne aktualizácie." diff --git a/po/sr.po b/po/sr.po index c2cd91c3..420a0fa4 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic \n" "Language-Team: Serbian \n" @@ -130,7 +130,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -143,79 +143,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,72 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,31 +504,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -525,36 +536,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -588,11 +602,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -623,7 +637,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -744,8 +758,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -768,110 +782,94 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -879,52 +877,56 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -940,84 +942,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1121,10 +1135,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1151,10 +1165,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1204,7 +1218,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1223,7 +1237,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1247,192 +1261,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/sv.po b/po/sv.po index 34bd43c1..a1bac353 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors \n" "Language-Team: Swedish \n" @@ -133,9 +133,9 @@ msgstr "" "Nyckeln du valde kan inte tas bort. Var vänlig anmäl detta som en bugg." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "Skriv in ett namn på skivan" msgid "Please insert a disc in the drive:" msgstr "Sätt in en skiva i enheten:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Trasiga paket" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,23 +164,23 @@ msgstr "" "programmet. Reparera dem först med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan inte uppdatera obligatoriska meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 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:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kunde inte beräkna uppdateringen" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -189,11 +189,11 @@ msgstr "" "vänlig rapportera detta som en bugg. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisiera vissa paket" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Kan inte installera \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,15 +217,16 @@ msgstr "" "rapportera detta som en bugg. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Kan inte gissa meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -235,12 +236,12 @@ msgstr "" " Installera ett av dessa paket med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Misslyckades med att hämta" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -250,15 +251,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Läser cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -266,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Hittade ingen giltig serverspegel" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -290,11 +291,11 @@ msgstr "" "Om du väljer \"nej\" kommer uppdateringen avbrytas." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Lägg till standardförråd?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -307,11 +308,11 @@ msgstr "" "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" kommer " "uppdateringen avbrytas." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Information om förråd ogiltig" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -319,13 +320,14 @@ msgstr "" "Uppdatering av förrådsinformationen orsakade en ogiltig fil. Var vänlig " "rapportera detta som en bugg." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Tredjepartskällor inaktiverade" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -333,11 +335,11 @@ msgstr "" "aktivera dem efter uppgraderingen med verktyget \"software-properties\" " "eller med synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Fel vid uppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -346,11 +348,11 @@ msgstr "" "av nätverksproblem, var god kontrollera din nätverksanslutning och försök " "igen." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Inte tillräckligt med ledigt diskutrymme" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -362,15 +364,15 @@ msgstr "" "använda 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Vill du starta uppdateringen?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Det gick inte att installera uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -382,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:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Det gick inte ladda ner uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -394,39 +396,40 @@ msgstr "" "Uppdateringen avbryts nu. Var god kontrollera din internetanslutning eller " "ditt installationsmedia och försök igen. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Viss programvara har inte längre officiellt stöd" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't 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:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Ta bort föråldrade paket?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Hoppa över det här steget" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Ta bort" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Fel inträffade vid utförandet" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,26 +438,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Återställer systemstatus" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Kontrollerar pakethanterare" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Uppdaterar förrådsinformation" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Ogiltig paketinformation" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,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:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Ber om bekräftelse" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Uppgraderar" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Söker efter föråldrad mjukvara" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Systemuppdateringen är klar." @@ -500,7 +508,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Hämtar hem fil %li av %li i %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Omkring %li minuter återstår" @@ -530,23 +538,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Ersätt konfigurationsfil\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Kommandot \"diff\" hittades inte" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ett kritiskt fel uppstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -561,28 +575,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket kommer att tas bort." msgstr[1] "%s paket kommer att tas bort." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nytt paket kommer att installeras." msgstr[1] "%s nya paket kommer att installeras." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket kommer att uppgraderas." msgstr[1] "%s paket kommer att uppgraderas." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -590,7 +604,7 @@ msgid "" "You have to download a total of %s. " msgstr "Du behöver ladda ner totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -598,30 +612,36 @@ msgid "" msgstr "" "Uppdateringen kan ta flera timmar och kan inte avbrytas någon gång senare." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Stäng alla öppna program och dokument för att undvika dataförlust." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Kunde inte hitta några uppgraderingar" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Ditt system är uppdaterat" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Ditt system har redan uppgraderats." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +#, fuzzy +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" +"Det finns %s uppdateringar tillgängliga för ditt system, som kräver " +"att %s data hämtas." -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "Ta bort %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installera %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Uppgradera %s" @@ -655,11 +675,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Omstart krävs" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -696,10 +716,8 @@ msgid "Start the upgrade?" msgstr "Starta uppgraderingen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Uppdaterar till Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -826,9 +844,10 @@ msgid "Verfication failed" msgstr "Kontrollen misslyckades" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Kontrollen av uppdateringen misslyckades. Det kan vara ett problem med " "nätverket eller servern. " @@ -855,16 +874,16 @@ msgstr "Hämtar hem fil %li av %li i %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Hämtar hem fil %li av %li med okänd hastighet" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -872,137 +891,130 @@ msgstr "" "Misslyckades med att hämta listan med ändringar. Kontrollera din " "internetanslutning." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" -#: ../UpdateManager/UpdateManager.py:230 +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 #, fuzzy -msgid "Recommended updates of Ubuntu" +msgid "Recommended updates" msgstr "%d uppdateringar" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "%d uppdateringar" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:239 +#, fuzzy +msgid "Backports" +msgstr "%d uppdateringar" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Uppdatera till senaste versionen av Ubuntu" +msgid "Normal updates" +msgstr "%d uppdateringar" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Uppdateringar" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Det går inte att installera alla tillgängliga uppdateringar" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Hämtar lista med ändringar..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" -msgstr "Markera _inga" +#: ../UpdateManager/UpdateManager.py:545 +#, fuzzy +msgid "_Uncheck All" +msgstr "_Uppdatera alla" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "Markera _alla" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Kontrollera" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 #, fuzzy msgid "None" msgstr "en" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 #, fuzzy msgid "1 KB" msgstr "%d kB" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../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:605 +#: ../UpdateManager/UpdateManager.py:591 #, fuzzy, python-format msgid "%.1f MB" msgstr "%.2f MB" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Nerladdningsstorlek: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Ditt system är uppdaterat" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, 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:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Var god vänta, det här kan ta lite tid" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Uppdateringen är färdig" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Kontrollera efter tillgängliga uppdateringar" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny version: %s (Storlek: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s:" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, fuzzy, python-format msgid "(Size: %s)" msgstr "Storlek:" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Din distribution stöds inte längre" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +1024,17 @@ msgstr "" "till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer " "information om att uppgradera." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Indexet för program är trasigt" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -1046,58 +1058,67 @@ msgstr "" "\"Programvaruinställningar\"" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "Håll ditt system uppdaterat" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"Undersöker ditt system\n" +"Fel vid genomsökning av CD\n" "\n" -"Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig nya " -"funktioner." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "Håll ditt system uppdaterat" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Starta uppgraderingen?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Avbryt _nedladdningen" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Ändringar" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Kontrollera" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Kontrollera programvarukanalerna efter nya uppdateringar" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivning" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Versionsinformation" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Visa förlopp för enstaka filer" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Programvaruuppdateringar" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1105,32 +1126,37 @@ msgstr "" "Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig nya " "funktioner." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Uppdateringar" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Uppdatera till senaste versionen av Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Kontrollera" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Distribution:" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Dölj denna information i framtiden" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Installera uppdateringar" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Ändringar" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 #, fuzzy msgid "updates" msgstr "Uppdateringar" @@ -1243,11 +1269,12 @@ msgid "_Install security updates without confirmation" msgstr "_Installera säkerhetsuppdateringar utan bekräftelse" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1281,10 +1308,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Skriv in hela APT-raden till kanalen du vill lägga till\n" @@ -1343,8 +1370,9 @@ msgid "Check for new distribution releases" msgstr "Sök efter ny utgåva av distributionen" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1365,8 +1393,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Sparar storleken på uppdateringshanterarens fönster" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Sparar läget på expanderaren som innehåller listan på ändringar och " @@ -1394,214 +1423,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Uppdateringar" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Bidragen programvara" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ickefri (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ickefri (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Programvara med USA-exportbegränsningar" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -#, fuzzy -msgid "Recommended updates" -msgstr "%d uppdateringar" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "%d uppdateringar" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 #, fuzzy msgid "Backported updates" msgstr "%d uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Stöds officiellt" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Bakåtportar" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Stöds officiellt" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Bakåtportar" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ickefri (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Viss programvara har inte längre officiellt stöd" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begränsad upphovsrätt" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Bakåtportar" @@ -1652,6 +1658,57 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden" msgid "Non-DFSG-compatible Software" msgstr "Inte DFSG-kompatibel programvara" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Viss programvara har inte längre officiellt stöd" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Kunde inte hitta några uppgraderingar" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Ditt system har redan uppgraderats." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Uppdaterar till Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" + +#, fuzzy +#~ msgid "Recommended updates of Ubuntu" +#~ msgstr "%d uppdateringar" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Uppdatera till senaste versionen av Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Det går inte att installera alla tillgängliga uppdateringar" + +#~ msgid "Select _None" +#~ msgstr "Markera _inga" + +#~ msgid "Select _All" +#~ msgstr "Markera _alla" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "Undersöker ditt system\n" +#~ "\n" +#~ "Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig " +#~ "nya funktioner." + +#~ msgid "Oficially supported" +#~ msgstr "Stöds officiellt" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1841,9 +1898,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Installing updates" #~ msgstr "Installerar uppdateringar" -#~ msgid "Check for available updates" -#~ msgstr "Kontrollera efter tillgängliga uppdateringar" - #~ msgid "Sections:" #~ msgstr "Avdelningar:" @@ -2035,9 +2089,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Components" #~ msgstr "Komponenter" -#~ msgid "Distribution:" -#~ msgstr "Distribution:" - #~ msgid "Type:" #~ msgstr "Typ:" @@ -2876,9 +2927,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "_Updates" #~ msgstr "_Uppdateringar" -#~ msgid "_Update All" -#~ msgstr "_Uppdatera alla" - #~ msgid "Privilege" #~ msgstr "Privilegium" @@ -3576,13 +3624,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ "Det finns en uppdatering tillgänglig för ditt system, som kräver " #~ "att %s data hämtas." -#~ msgid "" -#~ "There are %s updates available for your system, totalling %s of data to be downloaded." -#~ msgstr "" -#~ "Det finns %s uppdateringar tillgängliga för ditt system, som " -#~ "kräver att %s data hämtas." - #~ msgid " Of these updates, one is urgent." #~ msgstr " Utav dessa uppdateringar är en brådskande." diff --git a/po/th.po b/po/th.po index afcc2d56..1d7c9bae 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" @@ -127,9 +127,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -145,11 +145,11 @@ msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิ msgid "Please insert a disc in the drive:" msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "แพกเกจเสียหาย" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -157,34 +157,34 @@ msgstr "" "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic " "หรือ apt-get ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "แพจเกจที่สำคัญจะถูกลบออก" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "ไม่สามารถคำนวนการปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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,27 +193,28 @@ msgstr "" "ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย " "คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "ไม่สามารถติดตั้ง '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -222,12 +223,12 @@ msgstr "" "กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic หรือโปรแกรม apt-get " "ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "ไม่สามารถเอามาได้" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -237,15 +238,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "กำลังอ่านจากที่เก็บชั่วคราว" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +254,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -276,11 +277,11 @@ msgstr "" "ถ้าคุณเลือก 'no' การปรับปรุงจะถูกยกเลิก" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "สร้าง default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -292,23 +293,24 @@ msgstr "" "\n" "ควรเพิ่มรายการสำหรับ '%s' หรือไม่?ถ้าคุณเลือก 'No' การปรับปรุงจะถูกยกเลิก" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "แหล่งอื่นๆใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" @@ -316,11 +318,11 @@ msgstr "" "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' " "หรือด้วยโปรแกรม synaptic" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "เกิดข้อผิดพลาดขณะปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -328,11 +330,11 @@ msgstr "" "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติแล้วจะเป็นปัญหาด้านเครือข่าย " "กรุณาตรวจสอบการสื่อสารในเครือข่ายของคุณแล้วลองใหม่อีกที" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +345,15 @@ msgstr "" "เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "ไม่สามารถปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,11 +365,11 @@ msgstr "" "การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --" "configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -375,67 +377,73 @@ msgstr "" "การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation " "mediaและลองอีกครั้ง " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "แพกเกจเหล่านีไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้วและตอนนี้ได้รับสนับสนุนจากชุมชน " "('universe') แต่เพียงอย่างเดียว\\n\n" "\\n\n" "ถ้าคุณไม่ได้เลือกใช้แหล่งข้อมูล 'universe' แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_ข้ามขั้นตอนนี้" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "เ_อาออก" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "เริ่มระบบใหม่อีกครั้ง" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -447,19 +455,19 @@ msgstr "" "หลังจากการปรับปรุงข้อมูลของแพจเกจ แพจเกจที่จำเป็น '%s'ได้หายไป\n" "นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "_ถามการยืนยันจากคุณก่อน" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "กำลังปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "ปรับปรุงระบบเสร็จแล้ว" @@ -480,7 +488,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ที่ %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "เหลือประมาณ %li นาที" @@ -510,23 +518,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "เปลี่ยนไฟล์ปรับแต่ง\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "ไม่เจอคำสั่ง 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "เกิดข้อผิดพลาดอย่างร้ายแรง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -540,25 +554,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s แพกเกจจะถูกลบออก" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s แพกเกจใหม่จะถูกติดตั้ง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s แพกเกจจะถูกปรับปรุง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -566,37 +580,40 @@ msgid "" "You have to download a total of %s. " msgstr "คุณจะต้องดาวน์โหลดทั้งหมด %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "การปรับปรุงอาจจะใช้เวลานานหลายชั่วโมงและไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "เพื่อป้องกันข้อมูลสูญหายกรุณาออกจากทุกโปรแกรมและเอกสารที่เปิดอยู่" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "ไม่มีอะไรให้ปรับปรุง" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "ระบบของคุณทันสมัยแล้ว" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "ระบบของคุณได้ผ่านการปรับปรุงแล้ว" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "ลบออก %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "ติดตั้ง %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "ปรับปรุงรุ่น %s" @@ -630,11 +647,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "ต้องเริ่มระบบใหม่" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "การปรับปรุงเสร็จสิ้นแล้วและต้องการที่จะเริ่มระบบใหม่ คุณต้องการที่จะทำเดี๋ยวนี้หรือเปล่า?" @@ -668,9 +685,8 @@ msgid "Start the upgrade?" msgstr "เริ่มการปรับปรุงหรือไม่?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" -msgstr "กำลังปรับปรุงอูบันตู 6.06 LTS" +msgid "Upgrading Ubuntu to version 6.10" +msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -790,9 +806,10 @@ msgid "Verfication failed" msgstr "ไม่สามารถตรวจเช็คความถูกต้องได้" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -815,149 +832,140 @@ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li msgid "Downloading file %li of %li with unknown speed" msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "อูบันตู 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_ติดตั้งปรัยปรุง" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" +msgid "Normal updates" +msgstr "_ติดตั้งปรัยปรุง" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "รุ่น %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "เ_ลือก" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "ขนาดดาวน์โหลด: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "ระบบของคุณทันสมัยแล้ว" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "ปรับปรุงเสร็จสิ้นแล้ว" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_ติดตั้งปรัยปรุง" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "รุ่นใหม่: %s (ขนาด: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "รุ่น %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -967,17 +975,17 @@ msgstr "" "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com " "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "ดัชนีของซอฟแวร์เสียหาย" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -999,88 +1007,103 @@ msgstr "" "\"Administration\" -> \"Software Properties\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "รักษาระบบของคุณให้ทันสมัย" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"ตรวจสอบระบบของคุณ\n" +"มีปัญหาตรวจสอบแผ่นซีดี\n" "\n" -"ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "รักษาระบบของคุณให้ทันสมัย" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "เริ่มการปรับปรุงหรือไม่?" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "ยกเลิก_ดาวน์โหลด" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "เปลี่ยนแปลง" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "ต_รวจ" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "ตรวจช่องซอฟแวร์สำหรับรายการปรับปรุงใหม่" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "คำบรรยาย" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "บันทึกรายการปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "แสดงการคืบหน้าของแต่ละไฟล์" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "ซอฟต์แวร์ปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_ปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "เ_ลือก" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_ซ่อนข้อมูลนี้ในคราวหน้า" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "เปลี่ยนแปลง" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1188,11 +1211,12 @@ msgid "_Install security updates without confirmation" msgstr "_ติดตั้งการปรับปรุงด้านความปลอดภัยโดยไม่ต้องถามก่อน" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1225,10 +1249,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "กรุณาเติมให้ครบบรรทัด APT ของช่องที่คุณต้องการจะเพิ่ม\n" @@ -1284,8 +1308,9 @@ msgid "Check for new distribution releases" msgstr "ตรวจหาชุดเผยแพร่ใหม่" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1305,8 +1330,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "บึนทึกขนาดของหน้าต่างของโปรแกรมจัดการปรับปรุง" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "บันทึกสถานะของตัวขยาย(expander)ที่มีรายการของการเปลี่ยนแปลงและคำบรรยาย" @@ -1332,212 +1358,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "อูบันตู 5.10 Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "ชุมชนดูแล (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "อูบันตู 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "ชุมชนดูแล (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "อูบันตู 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "อูบันตู 5.10 Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_ติดตั้งปรัยปรุง" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "อูบันตู 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "สนับสนุนอย่างเป็นทางการ" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "อูบันตู 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "สนับสนุนอย่างเป็นทางการ" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "อูบันตู 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "จำกัดลิขสิทธิ์" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "อูบันตู 5.10 Backports" @@ -1588,6 +1591,46 @@ msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอ msgid "Non-DFSG-compatible Software" msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" +#~ msgid "Some software no longer officially supported" +#~ msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" + +#~ msgid "Could not find any upgrades" +#~ msgstr "ไม่มีอะไรให้ปรับปรุง" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "ระบบของคุณได้ผ่านการปรับปรุงแล้ว" + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "กำลังปรับปรุงอูบันตู 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "อูบันตู 5.10 Security Updates" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" + +#~ msgid "Cannot install all available updates" +#~ msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "ตรวจสอบระบบของคุณ\n" +#~ "\n" +#~ "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "สนับสนุนอย่างเป็นทางการ" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/tr.po b/po/tr.po index f1a299ec..422f1414 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI \n" "Language-Team: Turkish \n" @@ -128,9 +128,9 @@ 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 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -146,11 +146,11 @@ msgstr "Lütfen disk için bir isim girin" msgid "Please insert a disc in the drive:" msgstr "Lütfen sürücüye bir disk yerleştirin:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Bozuk paketler" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -158,60 +158,61 @@ 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:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' yüklenemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 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:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -220,11 +221,11 @@ msgstr "" " Lütfen devam etmeden önce, synaptic veya apt-get kullanarak yukarıdaki " "paketlerden birini kurun." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -234,15 +235,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Önbellek okunuyor" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -250,11 +251,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Geçerli yansı bulunamadı" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -267,11 +268,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -284,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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Üçüncü parti kaynaklar devredışı bırakıldı" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Güncelleştirme sırasında hata" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -317,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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Yeterince boş disk alanı yok" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -330,15 +331,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Yükseltmeyi başlatmak istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Yükseltmeler kurulamadı" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -347,11 +348,11 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Yükseltmeler indirilemedi" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -359,62 +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:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "Bu Adımı _Atla" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Kaldır" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Geçersiz paket bilgisi" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -424,19 +430,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Yükseltiliyor" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Sistem yükseltmesi tamamlandı." @@ -457,7 +463,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -489,19 +495,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "'diff' komutu bulunamadı" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -511,25 +523,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -537,36 +549,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Sisteminiz zaten yükseltilmiş." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s'i kur" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s'i yükselt" @@ -600,11 +615,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Yeniden başlatma gerekiyor" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -637,11 +652,8 @@ msgid "Start the upgrade?" msgstr "Yükseltme başlatılsın mı?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"Ubuntu 6.06 LTS'ya yükseltiliyor" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -762,8 +774,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -786,162 +798,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -957,84 +957,101 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" +"CD taramada hata\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Yükseltme başlatılsın mı?" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1141,10 +1158,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1171,10 +1188,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1226,7 +1243,7 @@ msgstr "Yeni dağıtım yayımları için kontrol et" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1245,7 +1262,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1270,205 +1287,183 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Sınırlı telif hakkı" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Resmi olarak desteklenenler" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Resmi olarak desteklenenler" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Resmi olarak desteklenenler" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Sınırlı telif hakkı" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" @@ -1519,6 +1514,24 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Your system has already been upgraded." +#~ msgstr "Sisteminiz zaten yükseltilmiş." + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "Ubuntu 6.06 LTS'ya yükseltiliyor" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Resmi olarak desteklenenler" + #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "Yükseltme şimdi iptal edilecek. Lütfen bu hatayı bildirin." diff --git a/po/uk.po b/po/uk.po index 2b33d01f..cf7c4fa6 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff \n" "Language-Team: Ukrainian \n" @@ -132,7 +132,7 @@ msgstr "Вибраний ключ неможливо видалити. Спов #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -145,11 +145,11 @@ msgstr "Введіть назву диску" msgid "Please insert a disc in the drive:" msgstr "Вставте диск в пристрій:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Пошкоджені пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -157,46 +157,46 @@ msgstr "" "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені " "цією програмою. Скористайтесь перш програмами synaptic чи apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Не можливо поновити необхідні meta-пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Це призведе довидалення базового пакунку системи" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Не можливо розрахувати поновлення" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Помилка підписів в деяких пакунках" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -204,24 +204,27 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" +"Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені " +"цією програмою. Скористайтесь перш програмами synaptic чи apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -231,15 +234,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Зчитування кешу" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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,12 +250,12 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 #, fuzzy msgid "No valid mirror found" msgstr "Не знайдено" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -265,11 +268,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -278,43 +281,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Помилка в даних про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Помилка підчас поновлення" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Недостатньо місця на диску" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -323,15 +326,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Бажаєте почати апгрейд системи?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Неможливо провести апргрейд системи" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -344,11 +347,11 @@ msgstr "" "Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою " "Synaptic для налаштування системи." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Неможливо завантажити пакунки для апргрейду системи" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -356,37 +359,37 @@ msgstr "" "Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з " "інтернетом чи носії та спробуйте знов. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 #, fuzzy msgid "Remove obsolete packages?" msgstr "Видалити непотрібні пакунки?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -395,27 +398,32 @@ msgstr "" "нижче. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "Перезавантаження системи" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Перевірка програми управління пакунками" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Отримання інформації про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -425,20 +433,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Запит підтвердження" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Пошук програм, що не використовуються" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Апргрейд системи завершено." @@ -459,7 +467,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Завантажується файл %li of %li at %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -492,19 +500,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Виникла невиправна помилка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -517,31 +531,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s пакунків буде видалено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s пакунків буде встановлено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "буде проведено апргрейд %s пакунків." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -549,7 +563,7 @@ msgid "" "You have to download a total of %s. " msgstr "Потрібно завантажити всього %s пакунків." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -558,30 +572,34 @@ msgstr "" "Апрейд може продовжуватись декілька годин, і не може бути перервано протягом " "всього часу." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Не знайдено пакунків для апгрейду" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "Ваша система оновлена!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Апгрейд вашої системи вже проведено." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, fuzzy, python-format msgid "Remove %s" msgstr "Видалити %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, fuzzy, python-format msgid "Install %s" msgstr "Встановити %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Апргрейд %s" @@ -615,11 +633,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Необхідно перезавантажити систему" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -654,7 +672,7 @@ msgid "Start the upgrade?" msgstr "Почати апгрейд системи?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -783,8 +801,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -808,16 +826,16 @@ msgstr "Завантажується файл %li of %li at %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Завантажується файл %li of %li на невизначенії швидкості" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Доступний новий випуск Ubuntu!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -825,102 +843,85 @@ msgid "" msgstr "" "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Оновлення безпеки Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Встановлення оновлень..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Апгрейд системи Ubuntu" +msgid "Normal updates" +msgstr "Встановлення оновлень..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Встановлення оновлень..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "Пошук пакунків для апгрейду" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Версія %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Завантаження змін" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Ваша система оновлена!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -928,54 +929,59 @@ msgstr[0] "Неможливо провести апргрейд системи" msgstr[1] "Неможливо провести апргрейд системи" msgstr[2] "Неможливо провести апргрейд системи" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 #, fuzzy msgid "Update is complete" msgstr "Завантадення пакунків завершено" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Встановлення оновлень..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версія %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ваш дистрибутив вже не підтримується" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -991,86 +997,100 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "Почати апгрейд системи?" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Скасувати _Завантаження" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Зміни" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Опис" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Оновлення програм" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "П_родовжити апгрейд системи" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Встановлення оновлень..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Зміни" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1186,10 +1206,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1218,10 +1238,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Введіть повний рядок APT репозиторію, який ви бажаєте додати\n" "Language-Team: LANGUAGE \n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -438,7 +443,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -470,19 +475,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -492,28 +503,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -521,36 +532,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -584,11 +598,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -619,7 +633,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -740,8 +754,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -764,162 +778,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -935,84 +937,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1116,10 +1130,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1146,10 +1160,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1199,7 +1213,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1218,7 +1232,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1242,192 +1256,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/ur.po b/po/ur.po index 0064ae7b..5b170945 100644 --- a/po/ur.po +++ b/po/ur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -130,7 +130,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -143,79 +143,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,72 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -522,36 +533,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -585,11 +599,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -620,7 +634,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -741,8 +755,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -765,162 +779,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -936,84 +938,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1118,10 +1132,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1148,10 +1162,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1201,7 +1215,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1220,7 +1234,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1244,192 +1258,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/urd.po b/po/urd.po index 0a34f9a4..3d403f41 100644 --- a/po/urd.po +++ b/po/urd.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -130,7 +130,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -143,79 +143,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,72 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -522,36 +533,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -585,11 +599,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -620,7 +634,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -741,8 +755,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -765,162 +779,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -936,84 +938,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1118,10 +1132,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1148,10 +1162,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1201,7 +1215,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1220,7 +1234,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1244,192 +1258,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" diff --git a/po/vi.po b/po/vi.po index 0c564a83..d1f26a40 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" @@ -131,7 +131,7 @@ msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông b #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -144,56 +144,56 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." 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:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -201,24 +201,24 @@ 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:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -228,15 +228,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -336,73 +336,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Một bộ quản lý gói khác đang chạy" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -412,20 +417,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Nâng cấp xong" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -445,7 +450,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -478,19 +483,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -500,25 +511,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -526,36 +537,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "Hệ thống bạn toàn mới nhất." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -589,11 +604,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -624,7 +639,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -749,8 +764,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -774,16 +789,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Có một bản phát hành Ubuntu mới công bố." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -792,153 +807,142 @@ msgstr "" "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động " "chưa." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Đang cài đặt bản cập nhật..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Đang cài đặt bản cập nhật..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "Đang kiểm tra có cập nhật..." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Phiên bản %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Đang tải các thay đổi" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Hệ thống bạn toàn mới nhất." - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Đang cài đặt bản cập nhật..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Phiên bản %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, 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:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -954,86 +958,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Đổi" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Mô tả" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Bản cập nhật phần mềm" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Đổi" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1147,10 +1163,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1179,10 +1195,10 @@ msgstr "Địa chỉ định vị:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "Hãy nhập toàn dòng APT của kho cần thêm\n" @@ -1242,7 +1258,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1261,7 +1277,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1286,217 +1302,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Bản cập nhật Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Phần mềm đã đóng góp" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Không tự do (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Không tự do (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Phần mềm bị giới hạn xuất Mỹ" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Đang cài đặt bản cập nhật..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Được hỗ trợ một cách chính thức" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Được hỗ trợ một cách chính thức" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Không tự do (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Được hỗ trợ một cách chính thức" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Bản quyền bị giới hạn" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Bản cập nhật Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" @@ -1550,6 +1543,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" + +#, fuzzy +#~ msgid "Cannot install all available updates" +#~ msgstr "Đang kiểm tra có cập nhật..." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Được hỗ trợ một cách chính thức" + #, fuzzy #~ msgid "The upgrade aborts now. Please report this 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." diff --git a/po/xh.po b/po/xh.po index 1fc12d1e..60067ee2 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -130,7 +130,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -143,79 +143,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,72 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -522,36 +533,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -585,11 +599,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -620,7 +634,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -741,8 +755,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -765,165 +779,156 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Kukho i-%i yohlaziyo ekhoyo" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Bonisa izihlaziyo" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Bonisa izihlaziyo" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -939,86 +944,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "Software Updates" msgstr "Bonisa izihlaziyo" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Bonisa izihlaziyo" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1125,10 +1142,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1157,10 +1174,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" @@ -1211,7 +1228,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1230,7 +1247,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1254,194 +1271,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1491,6 +1486,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Bonisa izihlaziyo" + #, fuzzy #~ msgid "Channels" #~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" diff --git a/po/zh_CN.po b/po/zh_CN.po index b36da2ac..3ad9723b 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-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_CN \n" @@ -133,9 +133,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你所选择的密钥不能被删除。请汇报这个bug" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "请输入光盘的名称" msgid "Please insert a disc in the drive:" msgstr "请将光盘插入到光驱里:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "破损的软件包" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -163,34 +163,34 @@ msgstr "" "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者" "apt-get修复它们。" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "不能升级要求的元包" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "一个必要的软件包会被删除" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "无法计算升级" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "在认证一些软件包时出错" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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,27 +199,28 @@ msgstr "" "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软" "件包的列表。" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "无法安装'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "无法安装要求的软件包。请汇报这个bug。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "无法猜出元包" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -227,12 +228,12 @@ msgstr "" "确定你运行的ubuntu的版本。 请在继续前先用新立得或apt-get安装以上所举软件包中" "的一个。" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "下载失败" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -242,15 +243,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "正在读取缓存" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +259,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "未找到可用的镜像" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -279,11 +280,11 @@ msgstr "" "如果选'no'更新将被取消." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "生成默认的源?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,44 +296,45 @@ msgstr "" "\n" "添加用于'%s'的缺省条目?如果选择'No',升级将被取消." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "源的信息无效" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "第三方源被禁用" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "升级时出错" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "磁盘空间不足" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +345,15 @@ msgstr "" "get clean'命令来删除之前安装的临时软件包。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "你要开始升级么？" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "无法安装升级" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,75 +365,81 @@ msgstr "" "升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -" "a)。" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "无法下载升级包" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "一些软件已经不在被官方支持." +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "这些安装的包已不在被官方支持,仅为社区维护('universe').\n" "\n" "如果你没有启用'社区维护'源,下一步这些包将被建议移除. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "删除陈旧的软件包？" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "跳过这个步骤(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "删除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "确认时出错" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理时发生问题。更多信息请查看以下消息。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "正在恢复原始系统状态" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "正在检查软件包管理器" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "更新源的信息" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "无效的包信息" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -443,19 +451,19 @@ msgstr "" "包信息被更新后核心包'%s'没有找到.\n" "这标志着一个严重的错误,请报告bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "请求确认" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "正在更新" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "寻找陈旧的软件包" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "系统更新完毕" @@ -476,7 +484,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "正在下载文件%li/%li速度是%s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "大约还要%li分钟" @@ -506,23 +514,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "替换配置文件\n" "“%s”吗？" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "外部命令“diff”没有找到" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "出现致命错误" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -536,25 +550,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s软件包将被删除。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s新的软件包将被安装。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s软件包将被升级" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -562,37 +576,40 @@ msgid "" "You have to download a total of %s. " msgstr "你下载了总体的%s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "升级会持续几个小时且不能在稍后的任何时候被终止" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "关闭所有打开的程序和文档以防止数据丢失。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "不能找到任何升级" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "您的系统已为最新" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "你的系统已经升级。" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "删除%s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "安装%s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "升级%s" @@ -626,11 +643,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "需要重启" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升级已经完成并需要重启。你要现在重启么？" @@ -663,10 +680,8 @@ msgid "Start the upgrade?" msgstr "开始升级？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" -"正在升级到 Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -786,9 +801,10 @@ msgid "Verfication failed" msgstr "验证失败" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "验证升级程序失败。可能是网络或服务器的问题。 " #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -811,148 +827,139 @@ msgstr "正在下载文件 %li/%li 速度是 %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "正在下载文件 %li/%li 速度未知" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "变动列表尚不可用。请稍后再试。" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "变动列表尚不可用。请稍后再试。" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "无法下载更新列表。请检查您的网络连接。" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 安全更新" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "安装更新" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "升级到最新版本的Ubuntu" +msgid "Normal updates" +msgstr "安装更新" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "安装更新" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "无法安装所有升级" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "正在下载更新列表..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "检查（_C）" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "下载文件大小：%s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "您的系统已为最新" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "你可以安装 %s 个更新" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "请稍等，这需要花一些时间。" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "检查有效的更新" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新版本：%s(大小：%s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "您的发行版不再被支持" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 +969,17 @@ msgstr "" "\r\n" "http://www.ubuntu.com 来获取更多有关升级的信息。" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "新发行版 '%s' 可用" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "软件索引已被破坏" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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,88 +1001,103 @@ msgstr "" "变." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "保持你的系统更新" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"正在检查你的系统\n" +"读取光盘时出错\n" "\n" -"软件更新可以为你修复错误，除去安全漏洞，并提供新的特性。" +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "保持你的系统更新" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "开始升级？" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "取消下载(_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "变更" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "检查（_K）" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "检查软件频道以获得新的更新" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "描述" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "发布说明" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "显示单个文件进度" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "软件更新" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "软件更行可以为你修复错误，消除安全漏洞及提供新的特性" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "升级(_p)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "升级到最新版本的Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "检查（_C）" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "继续升级(_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "在以后隐藏该信息(_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "安装更新(_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "变更" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1186,11 +1208,12 @@ msgid "_Install security updates without confirmation" msgstr "不确认就安装安全更新(_I)" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1223,10 +1246,10 @@ msgstr "URI：" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "输入你想增加的完整的频道 APT 命令行\n" @@ -1286,8 +1309,9 @@ msgid "Check for new distribution releases" msgstr "检测新版本发布" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1307,8 +1331,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "储存更新管理器对话框的大小" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "储存包含变动和描述列表的扩展器的状态" @@ -1334,212 +1359,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "社区维护(Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "贡献的软件" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6-06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "社区维护(Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "社区维护(Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非自由(Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由(Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "美国限制出口的软件" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6-06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 安全更新" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "安装更新" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "官方支持" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 移植" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 安全更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "官方支持" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 移植" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "社区维护(Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由(Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "一些软件已经不在被官方支持." #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版权限制" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 移植" @@ -1590,6 +1593,45 @@ msgstr "带有非自由依赖关系的DFSG兼容软件" msgid "Non-DFSG-compatible Software" msgstr "非DFSG兼容软件" +#~ msgid "Some software no longer officially supported" +#~ msgstr "一些软件已经不在被官方支持." + +#~ msgid "Could not find any upgrades" +#~ msgstr "不能找到任何升级" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "你的系统已经升级。" + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "正在升级到 Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 安全更新" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "升级到最新版本的Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "无法安装所有升级" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "正在检查你的系统\n" +#~ "\n" +#~ "软件更新可以为你修复错误，除去安全漏洞，并提供新的特性。" + +#~ msgid "Oficially supported" +#~ msgstr "官方支持" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1685,9 +1727,6 @@ msgstr "非DFSG兼容软件" #~ msgid "Sections" #~ msgstr "节：" -#~ msgid "Check for available updates" -#~ msgstr "检查有效的更新" - #~ msgid "Sections:" #~ msgstr "节：" diff --git a/po/zh_HK.po b/po/zh_HK.po index 65eb63ef..06195b80 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-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -131,7 +131,7 @@ msgstr "你選定的密碼匙無法移除，請匯報問題。" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -144,56 +144,56 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -201,24 +201,24 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -228,15 +228,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, 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:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, 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:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "移除密碼匙時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, 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:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -336,73 +336,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -412,20 +417,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -445,7 +450,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -478,19 +483,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -500,28 +511,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -529,36 +540,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "系統已經在最新狀態！" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -592,11 +607,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -627,7 +642,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "Upgrading to Ubuntu 6.10" +msgid "Upgrading Ubuntu to version 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -752,8 +767,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -777,170 +792,159 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Ubuntu 已推出新版本！" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 安全性更新" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "正在安裝軟件更新..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "正在安裝軟件更新..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "正在安裝軟件更新..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "正在檢查更新套件..." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "版本 %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "正在下載更改紀錄" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "系統已經在最新狀態！" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "正在安裝軟件更新..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "已經不再支援你用的發行版本" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -956,86 +960,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "Starting update manager" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "更改紀錄" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "詳細說明" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "軟件更新" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟件更新..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "更改紀錄" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1149,10 +1165,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1181,10 +1197,10 @@ msgstr "URI:" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "請輸入整行你想加入的 APT 軟件庫位置\n" @@ -1243,7 +1259,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1262,7 +1278,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1287,217 +1303,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "協力維護軟件 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "協力維護軟件" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 更新" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "協力維護軟件 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非自由軟件 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由軟件 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "美國禁止出口軟件" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 更新" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 安全性更新" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "正在安裝軟件更新..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "官方支援" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "官方支援" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由軟件 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "官方支援" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版權受限" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 更新" @@ -1551,6 +1544,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 安全性更新" + +#, fuzzy +#~ msgid "Cannot install all available updates" +#~ msgstr "正在檢查更新套件..." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "官方支援" + #, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "你選定的密碼匙無法移除，請匯報問題。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 62a2dc1f..5bdfffd2 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-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan \n" "Language-Team: Chinese (Taiwan) \n" @@ -126,9 +126,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"Error scaning the CD\n" +"Error scanning the CD\n" "\n" "%s" msgstr "" @@ -144,11 +144,11 @@ msgstr "請輸入光碟的名稱" msgid "Please insert a disc in the drive:" msgstr "請將光碟放入光碟機：" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "不完整套件" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -156,34 +156,34 @@ msgstr "" "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 " "synaptic 或 apt-get 來修恢它們。" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "無法升級須要的元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "將會移除的核心套件" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "無法計算升級" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "計算升級時發生無法解決的問題，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 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,27 +192,28 @@ msgstr "" "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證" "的套件。" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "無法安裝‘%s’" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "無法安裝須要的套件，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy 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 " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -220,12 +221,12 @@ msgstr "" "此無法偵測正在執行那個版本的 ubuntu。\n" " 請進行操作前使用 synaptic 或 apt-get安裝上述其中一個套件" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "下載失敗" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -235,15 +236,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "正在讀取快取" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 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 +252,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "找不到有效的 mirror" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -274,11 +275,11 @@ msgstr "" "如果選擇「否」，則更新會被取消。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "產生預設的來源？" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -290,44 +291,45 @@ msgstr "" "\n" "需要加入預設的 '%s' 項目嗎？如果你選擇「否」，更新將會被取消。" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "無效的套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升級套件庫時導致無效的檔案。請匯報問題。" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "停用第三方來源" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"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 "" "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-" "properties' 工具或 synaptic升級後，你可以重新啟用它。" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "更新時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 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:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "磁碟空間不足" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -338,15 +340,15 @@ msgstr "" "clean'來移除先前安裝套件時的暫存檔。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "是否要開始升級？" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "無法安裝升級" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -358,72 +360,77 @@ msgstr "" "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --" "configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "無法下載升級套件" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升級現正中止。請檢查網路連線是否正常及再試 " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "有些軟體不再有官方支援" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "移除不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "略過這步驟(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "移除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "提交時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "恢復原先的系統狀態" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "正在檢查套件管理程式" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "正在更新套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "無效的套件資訊" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -433,19 +440,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "詢問以確認" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "升級中" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "尋搜不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "系統升級完成。" @@ -466,7 +473,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "正在下載檔案 %li/%li，速度在 %s/秒" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -496,23 +503,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "取代設定檔\n" "‘%s‘？" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "找不到‘diff’指令" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "發生嚴重錯誤" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -526,28 +539,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s 個套件將會移除。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s 個新套件將會安裝。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s 個套件將會升級。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -555,37 +568,40 @@ msgid "" "You have to download a total of %s. " msgstr "您總共需要下載 %s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "升級可能需要數小時及無法在稍後任何時間取消。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "避免遺失請關閉所有已開啟的程式及文件。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "無法找到任何升級" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "系統已經在最新狀態" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "系統升級已經完成。" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "Remove %s" msgstr "移除 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "安裝 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "升級 %s" @@ -619,11 +635,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "須要重新開機" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升級已經完成及須要重新啟動。現在要重新啟動嗎？" @@ -657,9 +673,8 @@ msgid "Start the upgrade?" msgstr "開始升級？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "Upgrading to Ubuntu 6.10" -msgstr "升級至 Ubuntu 6.06 LTS" +msgid "Upgrading Ubuntu to version 6.10" +msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -779,9 +794,10 @@ msgid "Verfication failed" msgstr "檢驗失敗" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "檢驗升級套件失敗。可能是因為跟伺服器的網路連接出現問題。 " #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -804,149 +820,140 @@ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" msgid "Downloading file %li of %li with unknown speed" msgstr "正在下載檔案 %li/%li，下載速度不明" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "修改紀錄不存在，請稍後再試。" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "修改紀錄不存在，請稍後再試。" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "無法下載更動列表。請檢查網路連線是否正常。" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 安全性更新" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "安裝更新套件(_I)" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "升級到最新版本的 Ubuntu" +msgid "Normal updates" +msgstr "安裝更新套件(_I)" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "安裝更新套件(_I)" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "無法安裝所有更新套件" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "正在下載修改紀錄..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "檢查(_C)" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "下載大小：%s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "系統已經在最新狀態" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "您可以安裝 %s 個更新" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "請稍候，這可能需要一點時間。" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "安裝更新套件(_I)" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新版本：%s （大小：%s）" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "您正使用的發行版本已不再支援" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 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 " @@ -955,17 +962,17 @@ msgstr "" "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 " "http://www.ubuntu.com以取得更多升級資訊。" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "New distribution release '%s' is available" msgstr "有新的 distribution 發行版 '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "軟體索引損壞" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 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 " @@ -986,88 +993,103 @@ msgstr "" "您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設定。" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"Examining your system\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Keep your system up-to-date" +msgstr "將您的系統維持在最新狀態" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "Not all updates can be installed" msgstr "" -"正在檢測您的系統\n" +"掃描光碟時發生錯誤\n" "\n" -"軟體更新會更正錯誤，排除安全弱點，並提功新功能." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "Keep your system up-to-date" -msgstr "將您的系統維持在最新狀態" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "Starting update manager" +msgstr "開始升級？" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "取消下載(_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "修改紀錄" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "檢查(_K)" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "檢查軟體來源有沒有更新套件" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "詳細說明" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "發行說明" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "顯示單一檔案的進度" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "軟體更新" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "軟體更新會更正錯誤, 排除安全弱點, 並提功新功能." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "升級(_P)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "升級到最新版本的 Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "檢查(_C)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "繼續升級(_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "以後不要再顯示此訊息(_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "安裝更新套件(_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "修改紀錄" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1175,11 +1197,12 @@ msgid "_Install security updates without confirmation" msgstr "無須確認便安裝安全性更新(_I)" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"The channel information is out-of-date\n" +"The information about available software is out-of-date\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1213,10 +1236,10 @@ msgstr "URI：" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"Enter the complete APT line of the source that you want to add\n" +"Enter the complete APT line of the repository that you want to add " +"as source\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "請輸入您想加入的完整的 APT 來源列\n" @@ -1272,8 +1295,9 @@ msgid "Check for new distribution releases" msgstr "檢查有沒有新的發行版本" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1293,8 +1317,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "儲存 update-manager 對話視窗的大小" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "儲存包含修改紀錄及描述的 expander 的狀態" @@ -1320,212 +1345,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "協力維護軟體 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "非自由軟體 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 ‘Dapper Drake‘" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "協力維護軟體 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非自由軟體 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由軟體 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 ‘Dapper Drake‘" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 安全性更新" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "安裝更新套件(_I)" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "官方支援" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 回移套件" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "官方支援" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 回移套件" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由軟體 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "有些軟體不再有官方支援" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版權受限制" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 回移套件" @@ -1576,6 +1578,46 @@ msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體" msgid "Non-DFSG-compatible Software" msgstr "不符合 DFSG 的軟體" +#~ msgid "Some software no longer officially supported" +#~ msgstr "有些軟體不再有官方支援" + +#~ msgid "Could not find any upgrades" +#~ msgstr "無法找到任何升級" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "系統升級已經完成。" + +#, fuzzy +#~ msgid "" +#~ "Upgrading to Ubuntu 6.10" +#~ msgstr "" +#~ "升級至 Ubuntu 6.06 LTS" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 安全性更新" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "升級到最新版本的 Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "無法安裝所有更新套件" + +#~ msgid "" +#~ "Examining your system\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "正在檢測您的系統\n" +#~ "\n" +#~ "軟體更新會更正錯誤，排除安全弱點，並提功新功能." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "官方支援" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " -- cgit v1.2.3 From d8c288d928da41fae20947b7dd2064740c2593b3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Sep 2006 12:45:53 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - check for self.sources,self.aptcdrom before using it --- DistUpgrade/DistUpgradeControler.py | 6 ++++-- debian/changelog | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index f9c4c0dd..e32c0c5f 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -551,8 +551,10 @@ class DistUpgradeControler(object): def abort(self): """ abort the upgrade, cleanup (as much as possible) """ - self.sources.restoreBackup(self.sources_backup_ext) - self.aptcdrom.restoreBackup(self.sources_backup_ext) + if hasattr(self, sources): + self.sources.restoreBackup(self.sources_backup_ext) + if hasattr(self, aptcdrom): + self.aptcdrom.restoreBackup(self.sources_backup_ext) # generate a new cache self._view.updateStatus(_("Restoring original system state")) self._view.abort() diff --git a/debian/changelog b/debian/changelog index 6631a01b..d817dea3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +update-manager (0.44.14) edgy; urgency=low + + * UpdateManager/UpdateManager.py: + - put the cancel button inside the text-area to avoid flickering + * DistUprade/DistUpgradeControler.py: + - check for self.sources, self.aptcdrom before using it (lp: #61852) + + -- + update-manager (0.44.13) edgy; urgency=low * UpdateManager/UpdateManager.py: -- cgit v1.2.3 From a7d1b0dd42e27785636db09b94a8fed834edebab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Sep 2006 23:34:28 +0200 Subject: * UpdateManager/Common/aptsources.py: - use self.source_code_sources when enabling a component * DistUpgrade/DistUpgradeControler.py: - make sure to enable restricted as well otherwise the kernel won't upgrade --- DistUpgrade/DistUpgradeControler.py | 5 +++++ UpdateManager/Common/aptsources.py | 2 +- debian/changelog | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 56ec7f08..ad4e5335 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -165,7 +165,12 @@ class DistUpgradeControler(object): # enable main (we always need this!) distro = Distribution() distro.get_sources(self.sources) + # we need both main + restricted for a real upgrade + # restricted is required for the kernel upgrade (otherwise + # it will just keep the kernel because linux-$arch depends on + # linux-restricted-modules from restricted) distro.enable_component(self.sources, "main") + distro.enable_component(self.sources, "restricted") # this must map, i.e. second in "from" must be the second in "to" # (but they can be different, so in theory we could exchange diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index 0d716231..06d83e01 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -636,7 +636,7 @@ class Distribution: # now do the same for source dists if self.get_source_code == True: comps_per_dist = {} - for s in sources: + for s in self.source_code_sources: if s.type != "deb-src": continue if not comps_per_dist.has_key(s.dist): diff --git a/debian/changelog b/debian/changelog index d817dea3..2f067c0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,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 Tue, 26 Sep 2006 23:17:27 +0200 update-manager (0.44.13) edgy; urgency=low -- cgit v1.2.3 From e40dd39c6ad5b1d29644430cdecdfc02bf674a8a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Sep 2006 16:57:26 +0200 Subject: * data/glade/SoftwareProperties.glade: - make add cdrom translatable --- data/glade/SoftwareProperties.glade | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') 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 @@ True - Add Cdrom + Add Cdrom True False GTK_JUSTIFY_LEFT diff --git a/debian/changelog b/debian/changelog index 2f067c0e..02ec4d9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.44.15) edgy; urgency=low + + * data/glade/SoftwareProperties.glade: + - fix missing "translatable" property (lp: #62681) + + -- + update-manager (0.44.14) edgy; urgency=low * UpdateManager/UpdateManager.py: -- cgit v1.2.3 From e6caff1e5bb222d50cb7a521f1ebee723ac1fc9d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 00:31:48 +0200 Subject: * changelog updates, uploaded --- DistUpgrade/DistUpgradeCache.py | 1 - debian/changelog | 22 +++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 453efe92..3d10c707 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -1,7 +1,6 @@ import warnings warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) -warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) import apt import apt_pkg import os diff --git a/debian/changelog b/debian/changelog index 8bc27537..3b83d42f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,26 +1,18 @@ -update-manager (0.44.15) edgy; urgency=low +update-manager (0.44.13) edgy; urgency=low + * fix missing i18n declarations (lp: #62519) * data/glade/SoftwareProperties.glade: - fix missing "translatable" property (lp: #62681) - * missing i18n added (lp: 62519) - - -- - -update-manager (0.44.14) edgy; urgency=low - + * DistUpgrade: + - deal better with the python transition and the hpijs + upgrade (lp: #62948) * UpdateManager/UpdateManager.py: - put the cancel button inside the text-area to avoid flickering - * DistUprade/DistUpgradeControler.py: - - check for self.sources, self.aptcdrom before using it (lp: #61852) - - -- Michael Vogt Tue, 26 Sep 2006 23:17:27 +0200 - -update-manager (0.44.13) edgy; urgency=low - - * UpdateManager/UpdateManager.py: - make sure that src_ver is always initialized (thanks to Simira for reporting) - filter python-apt future warning (especially for seb128) + * DistUprade/DistUpgradeControler.py: + - check for self.sources, self.aptcdrom before using it (lp: #61852) -- Michael Vogt Sat, 23 Sep 2006 00:53:06 +0200 -- cgit v1.2.3 From 4f287044ee83f8e77dc3136d10cef07d878ba1c2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Oct 2006 14:49:27 +0200 Subject: * DistUpgrade/DistUpgrade.glade - add missing "translatable" properties * DistUpgrade/DistUpgradeViewGtk.py: - fix incorrect i18n usage _() --- DistUpgrade/DistUpgrade.glade | 6 ++--- DistUpgrade/DistUpgradeViewGtk.py | 18 +++++++------- debian/changelog | 6 +++++ po/ar.po | 46 +++++++++++++++++++++------------- po/bg.po | 48 +++++++++++++++++++++++------------- po/bn.po | 48 +++++++++++++++++++++++------------- po/br.po | 46 +++++++++++++++++++++------------- po/ca.po | 48 +++++++++++++++++++++++------------- po/cs.po | 48 +++++++++++++++++++++++------------- po/da.po | 48 +++++++++++++++++++++++------------- po/de.po | 48 +++++++++++++++++++++++------------- po/el.po | 48 +++++++++++++++++++++++------------- po/en_AU.po | 48 +++++++++++++++++++++++------------- po/en_CA.po | 48 +++++++++++++++++++++++------------- po/en_GB.po | 46 +++++++++++++++++++++------------- po/es.po | 48 +++++++++++++++++++++++------------- po/fi.po | 48 +++++++++++++++++++++++------------- po/fr.po | 48 +++++++++++++++++++++++------------- po/fur.po | 46 +++++++++++++++++++++------------- po/gl.po | 46 +++++++++++++++++++++------------- po/he.po | 48 +++++++++++++++++++++++------------- po/hi.po | 46 +++++++++++++++++++++------------- po/hr.po | 48 +++++++++++++++++++++++------------- po/hu.po | 48 +++++++++++++++++++++++------------- po/id.po | 48 +++++++++++++++++++++++------------- po/it.po | 48 +++++++++++++++++++++++------------- po/ja.po | 48 +++++++++++++++++++++++------------- po/ka.po | 48 +++++++++++++++++++++++------------- po/ko.po | 48 +++++++++++++++++++++++------------- po/ku.po | 46 +++++++++++++++++++++------------- po/lt.po | 48 +++++++++++++++++++++++------------- po/mk.po | 46 +++++++++++++++++++++------------- po/ms.po | 46 +++++++++++++++++++++------------- po/nb.po | 48 +++++++++++++++++++++++------------- po/ne.po | 46 +++++++++++++++++++++------------- po/nl.po | 48 +++++++++++++++++++++++------------- po/no.po | 46 +++++++++++++++++++++------------- po/oc.po | 46 +++++++++++++++++++++------------- po/pa.po | 48 +++++++++++++++++++++++------------- po/pl.po | 48 +++++++++++++++++++++++------------- po/pt.po | 48 +++++++++++++++++++++++------------- po/pt_BR.po | 48 +++++++++++++++++++++++------------- po/ro.po | 48 +++++++++++++++++++++++------------- po/ru.po | 48 +++++++++++++++++++++++------------- po/rw.po | 48 +++++++++++++++++++++++------------- po/sk.po | 48 +++++++++++++++++++++++------------- po/sr.po | 46 +++++++++++++++++++++------------- po/sv.po | 52 ++++++++++++++++++++++++--------------- po/th.po | 48 +++++++++++++++++++++++------------- po/tr.po | 46 +++++++++++++++++++++------------- po/uk.po | 48 +++++++++++++++++++++++------------- po/update-manager.pot | 46 +++++++++++++++++++++------------- po/ur.po | 46 +++++++++++++++++++++------------- po/urd.po | 46 +++++++++++++++++++++------------- po/vi.po | 46 +++++++++++++++++++++------------- po/xh.po | 46 +++++++++++++++++++++------------- po/zh_CN.po | 48 +++++++++++++++++++++++------------- po/zh_HK.po | 46 +++++++++++++++++++++------------- po/zh_TW.po | 48 +++++++++++++++++++++++------------- 59 files changed, 1715 insertions(+), 967 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 615f698c..2d4ebf92 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -682,7 +682,7 @@ True True True - _Start Upgrade + _Start Upgrade True GTK_RELIEF_NORMAL True @@ -1264,7 +1264,7 @@ True True True - _Continue + _Continue True GTK_RELIEF_NORMAL True @@ -1487,7 +1487,7 @@ True True True - _Cancel Upgrade + _Cancel Upgrade True GTK_RELIEF_NORMAL True diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 1385d18f..69a3e586 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -97,7 +97,7 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress): self.parent = parent def mediaChange(self, medium, drive): #print "mediaChange %s %s" % (medium, drive) - msg = _("Please insert '%s' into the drive '%s'" % (medium,drive)) + msg = _("Please insert '%s' into the drive '%s'") % (medium,drive) dialog = gtk.MessageDialog(parent=self.parent.window_main, flags=gtk.DIALOG_MODAL, type=gtk.MESSAGE_QUESTION, @@ -126,10 +126,10 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress): currentItem = self.totalItems if self.currentCPS > 0: - self.status.set_text(_("Fetching file %li of %li at %s/s" % (currentItem, self.totalItems, apt_pkg.SizeToStr(self.currentCPS)))) + self.status.set_text(_("Fetching file %li of %li at %s/s") % (currentItem, self.totalItems, apt_pkg.SizeToStr(self.currentCPS))) self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr(self.eta)) else: - self.status.set_text(_("Fetching file %li of %li" % (currentItem, self.totalItems))) + self.status.set_text(_("Fetching file %li of %li") % (currentItem, self.totalItems)) self.progress.set_text(" ") while gtk.events_pending(): @@ -184,7 +184,7 @@ class GtkInstallProgressAdapter(InstallProgress): logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) #self.expander_terminal.set_expanded(True) self.parent.dialog_error.set_transient_for(self.parent.window_main) - summary = _("Could not install '%s'" % pkg) + summary = _("Could not install '%s'") % pkg msg = _("The upgrade aborts now. Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ in the bugreport.") markup="%s\n\n%s" % (summary, msg) @@ -500,8 +500,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): pkgs_upgrade) % pkgs_upgrade msg +=" " if downloadSize > 0: - msg += _("\n\nYou have to download a total of %s. " %\ - apt_pkg.SizeToStr(downloadSize)) + msg += _("\n\nYou have to download a total of %s. ") %\ + apt_pkg.SizeToStr(downloadSize) msg += estimatedDownloadTime(downloadSize) msg += "." @@ -532,11 +532,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): # fill in the details self.details_list.clear() for rm in self.toRemove: - self.details_list.append([_("Remove %s" % rm)]) + self.details_list.append([_("Remove %s") % rm]) for inst in self.toInstall: - self.details_list.append([_("Install %s" % inst)]) + self.details_list.append([_("Install %s") % inst]) for up in self.toUpgrade: - self.details_list.append([_("Upgrade %s" % up)]) + self.details_list.append([_("Upgrade %s") % up]) self.treeview_details.scroll_to_cell((0,)) self.dialog_changes.set_transient_for(self.window_main) self.dialog_changes.realize() diff --git a/debian/changelog b/debian/changelog index 3b83d42f..a8c8c707 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.44.14) edgy; urgency=low + + * fix some incorrect i18n markings (lp: #62681) + + -- Michael Vogt Mon, 2 Oct 2006 14:41:52 +0200 + update-manager (0.44.13) edgy; urgency=low * fix missing i18n declarations (lp: #62519) diff --git a/po/ar.po b/po/ar.po index 91ddd359..61651426 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi \n" "Language-Team: Arabic \n" @@ -142,30 +142,30 @@ msgstr "الرجاء ادخال اسم القرص" msgid "Please insert a disc in the drive:" msgstr "الرجاء ادخال القرص في الجهاز" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -672,25 +672,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/bg.po b/po/bg.po index ce1fc9bc..de8aae0e 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" @@ -150,11 +150,11 @@ msgstr "Моля, въведете име за диска" msgid "Please insert a disc in the drive:" msgstr "Моля, поставете диск в устройството:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Повредени пакети" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -163,20 +163,20 @@ msgstr "" "този софтуер. Моля, поправете ги със synaptic или apt-get преди да " "продължите!" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Не може да бъдат надградени изисквани мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "Ще трябва да бъде премахнат важен пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Не може да бъде планирано надграждането" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Грешка при удостоверяването автентичността на някои пакети" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Не може да се инсталира '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Не могат да бъдат предположени мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -745,25 +745,39 @@ msgid "Terminal" msgstr "Терминал" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Поднови надграждането" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Задържане" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Замяна" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Съобщи грешка" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Рестартирай сега" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Поднови надграждането" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Поднови надграждането" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Не бяха открити бележки към изданието" diff --git a/po/bn.po b/po/bn.po index a3a8211b..01de9ff2 100644 --- a/po/bn.po +++ b/po/bn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" @@ -146,30 +146,30 @@ msgstr "ডিস্কের জন্য একটি নাম দিন" msgid "Please insert a disc in the drive:" msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "ভাঙা প্যাকেজসমূহ" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "আপগ্রেড গণনা করতে পারছে না" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "'%s' ইন্সটল করা যাচ্ছে না" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "meta-package অনুমান করা যাচ্ছ না" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -692,25 +692,39 @@ msgid "Terminal" msgstr "টার্মিন্যাল" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "পুনরায় আপগ্রেড শুরু (_R)" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "রাখো (_K)" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "প্রতিস্হাপন (_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "বাগ রিপোর্ট (_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "এক্ষুনি রিস্টার্ট (_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "পুনরায় আপগ্রেড শুরু (_R)" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "পুনরায় আপগ্রেড শুরু (_R)" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "রিলিজ নোট পাওয়া যায় নি" diff --git a/po/br.po b/po/br.po index d933750b..4f10ce89 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" @@ -146,30 +146,30 @@ msgstr "Roit un anv evit ar bladenn marplij" msgid "Please insert a disc in the drive:" msgstr "Lakait ur bladenn e-barzh ul lenner marplij:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Pakadoù torr" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -673,25 +673,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/ca.po b/po/ca.po index c29de9b3..2017d490 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" @@ -151,11 +151,11 @@ msgstr "Introduïu un nom per al disc" msgid "Please insert a disc in the drive:" msgstr "Inseriu un disc a la unitat:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Paquets trencats" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 #, fuzzy msgid "Can't upgrade required meta-packages" msgstr "No s'han pogut actualitzar els metapaquets sol·licitats" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "No s'ha pogut instal·lar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -733,25 +733,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Reprén l'actualització" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Reemplaça" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Informa de l'error" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Reinicia" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Reprén l'actualització" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Reprén l'actualització" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "No s'han pogut trobar les notes de la versió" diff --git a/po/cs.po b/po/cs.po index 4554f451..fdbd6c36 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála \n" "Language-Team: Czech \n" @@ -147,11 +147,11 @@ msgstr "Prosím zadejte jméno disku" msgid "Please insert a disc in the drive:" msgstr "Prosím vložte disk do mechaniky:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Poškozené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,20 +159,20 @@ msgstr "" "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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Nemohu aktualizovat požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Nemohu vypočítat aktualizaci" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Chyba při ověření některých balíků" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Nemohu nainstalovat '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nemohu odhadnout meta-balík" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -719,25 +719,39 @@ msgid "Terminal" msgstr "Terminál" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Pokračovat v upgradu" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Ponechat" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Nahradit" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Oznámit chybu" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Restartovat nyní" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Pokračovat v upgradu" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Pokračovat v upgradu" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Nebyly nalezeny poznámky k vydání." diff --git a/po/da.po b/po/da.po index 9f8e8041..b8099a11 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K \n" "Language-Team: Danish \n" @@ -147,11 +147,11 @@ msgstr "Indtast venligst et navn til disken" msgid "Please insert a disc in the drive:" msgstr "Indsæt venligst en disk i drevet:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Ødelagte pakker" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke opgradere de krævede meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 #, 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 #, fuzzy msgid "Could not calculate the upgrade" msgstr "Kunne ikke udregne opgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Fejl ved godkendelse af nogle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 #, fuzzy msgid "Can't guess meta-package" msgstr "Kan ikke gætte meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -733,25 +733,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Genoptag opgradering" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Behold" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Erstat" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Rapporter fejl" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Genstart nu" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Genoptag opgradering" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Genoptag opgradering" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Kunne ikke finde udgivelsesnoterne" diff --git a/po/de.po b/po/de.po index 6dd01bb6..3608c085 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" @@ -153,11 +153,11 @@ msgstr "Geben Sie einen Namen für das Medium ein" msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie ein Medium in das Laufwerk:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Defekte Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -166,20 +166,20 @@ msgstr "" "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor " "Sie fortfahren." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Die Aktualisierung konnte nicht berechnet werden" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "›%s‹ kann nicht installiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Metapaket konnte nicht bestimmt werden" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -764,25 +764,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Aktualisierung fortsetzen" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Beibehalten" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Ersetzen" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Fehlerbericht ausfüllen" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Neu starten" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Aktualisierung fortsetzen" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Aktualisierung fortsetzen" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Freigabemitteilungen konnten nicht gefunden werden" diff --git a/po/el.po b/po/el.po index 779ef170..7466f50b 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -148,11 +148,11 @@ msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκ msgid "Please insert a disc in the drive:" msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Κατεστραμμένα πακέτα" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,20 +161,20 @@ msgstr "" "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή apt-" "get για να συνεχίσετε." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -755,25 +755,39 @@ msgid "Terminal" msgstr "Τερματικό" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Συνέχεια αναβάθμισης" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Διατήρηση" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "Αντικατά_σταση" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "Ανα_φορά σφάλματος" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "Επανε_κκίνηση τώρα" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Συνέχεια αναβάθμισης" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Συνέχεια αναβάθμισης" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Αδυναμία εύρεσης σημειώσεων έκδοσης" diff --git a/po/en_AU.po b/po/en_AU.po index efcc4b91..c2b9cd2b 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-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons \n" "Language-Team: English (Australia) \n" @@ -147,11 +147,11 @@ msgstr "Please enter a name for the disc" msgid "Please insert a disc in the drive:" msgstr "Please insert a disc in the drive:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Broken packages" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,20 +159,20 @@ msgstr "" "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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Can't upgrade required meta-packages" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Can't guess meta-packag" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -747,25 +747,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Resume Upgrade" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Keep" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Replace" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Report Bug" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Restart Now" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Resume Upgrade" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Resume Upgrade" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Could not find the release notes" diff --git a/po/en_CA.po b/po/en_CA.po index 86bc663c..857c0f8b 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-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -147,30 +147,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -684,27 +684,41 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "Upgrade finished" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "Reload" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 #, fuzzy msgid "_Resume Upgrade" msgstr "Upgrade finished" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "Upgrade finished" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 809ea292..8cfd6579 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-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" @@ -146,30 +146,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -684,26 +684,38 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "Reload" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/es.po b/po/es.po index 25c9a9a5..892c518b 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López \n" "Language-Team: Spanish \n" @@ -154,11 +154,11 @@ msgstr "Por favor, introduzca un nombre para el disco" msgid "Please insert a disc in the drive:" msgstr "Por favor, inserte un disco en la unidad:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Paquetes rotos" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -167,20 +167,20 @@ msgstr "" "software. Por favor, arréglelos primero usando Synaptic o apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "No se han podido actualizar los meta-paquetes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Error autenticando algunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "No se ha podido determinar el meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -762,25 +762,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Continuar actualización" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Conservar" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Sustituir" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Informar de un error" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Reiniciar ahora" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Continuar actualización" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Continuar actualización" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "No se han podido encontrar las notas de publicación" diff --git a/po/fi.po b/po/fi.po index 4c6655af..94c84233 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -149,11 +149,11 @@ msgstr "Syötä nimi levylle" msgid "Please insert a disc in the drive:" msgstr "Aseta levy asemaan:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Rikkinäisiä paketteja" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,20 +162,20 @@ msgstr "" "ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen " "jatkamista." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Ei voida päivittää tarvittavia metapaketteja" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Joitain paketteja todennettaessa tapahtui virhe" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Ei voitu asentaa pakettia \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Ei voitu arvata metapakettia" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -749,25 +749,39 @@ msgid "Terminal" msgstr "Pääte" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Jatka päivitystä" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Pidä" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Korvaa" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Tee virheraportti" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Uudelleenkäynnistä nyt" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Jatka päivitystä" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Jatka päivitystä" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Julkaisutietoja ei löytynyt" diff --git a/po/fr.po b/po/fr.po index b3c8b740..263f6d4b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" @@ -152,11 +152,11 @@ msgstr "Veuillez saisir un nom pour le disque" msgid "Please insert a disc in the drive:" msgstr "Veuillez insérer un disque dans le lecteur :" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Paquets défectueux" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Les meta-paquets désirés n'ont pu être mis à jour" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Impossible de calculer la mise à jour" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installer « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -762,25 +762,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Reprendre la mise à jour" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Conserver" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Remplacer" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Rapporter un bogue" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Redémarrer Maintenant" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Reprendre la mise à jour" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Reprendre la mise à jour" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Impossible de trouver les informations de version" diff --git a/po/fur.po b/po/fur.po index b80b99e6..548b7e2b 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz \n" "Language-Team: Friulian \n" @@ -142,30 +142,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -669,25 +669,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/gl.po b/po/gl.po index cc611a5c..50777c6f 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -150,30 +150,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -689,26 +689,38 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "Recargar" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/he.po b/po/he.po index 761d9293..e6efd588 100644 --- a/po/he.po +++ b/po/he.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: Hebrew \n" @@ -152,11 +152,11 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "אנא הכניסו תקליטור לכונן:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "חבילות פגומות" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,20 +164,20 @@ msgstr "" "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן " "באמצעות synaptic או apt-get לפני שתמשיך." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "חבילה חיונית תוסר בלית ברירה" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "לא ניתן להתקין את \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -699,25 +699,39 @@ msgid "Terminal" msgstr "מסוף" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_המשך בשידרוג" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_שמור" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_החלף" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_דווח על באג" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_אתחל עכשיו" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_המשך בשידרוג" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_המשך בשידרוג" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/hi.po b/po/hi.po index 8a95c9a7..d016c603 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Hindi \n" @@ -142,30 +142,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -669,25 +669,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/hr.po b/po/hr.po index e38d5605..ef0c3c6a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" @@ -148,11 +148,11 @@ msgstr "Upišite ime za disk" msgid "Please insert a disc in the drive:" msgstr "Ubacite CD u uređaj:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Pokvareni paketi" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Ne mogu nadograditi potrebne meta-pakete" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Nisam mogao riješiti nadogradnju" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Greška prilikom identificiranja nekih paketa" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Ne mogu instalirati '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nisam mogao odrediti meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -753,25 +753,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Nastavi nadogradnju" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Zadrži" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "Za_mijeni" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Prijavi bug" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "Ponovno pok_reni računalo" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Nastavi nadogradnju" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Nastavi nadogradnju" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Nisam mogao naći bilješke izdanja" diff --git a/po/hu.po b/po/hu.po index 75c9d3f6..44223273 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -147,11 +147,11 @@ msgstr "Kérem, adja meg a lemez nevét" msgid "Please insert a disc in the drive:" msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Törött csomagok" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "A szükséges meta-csomagok nem frissíthetőek" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Nem tudom megtervezni a frissítés menetét" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "'%s' nem telepíthető" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nem tudom megállapítani a meta-csomagot" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -749,25 +749,39 @@ msgid "Terminal" msgstr "Terminál" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "Frissítés _folytatása" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Megtartás" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Csere" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Hibabejelentés" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "Újrain_dítás most" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "Frissítés _folytatása" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "Frissítés _folytatása" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Nem érhetők el a kiadási megjegyzések" diff --git a/po/id.po b/po/id.po index 6928cfba..be93a9f1 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" @@ -147,11 +147,11 @@ msgstr "Silakan masukkan nama untuk cakram" msgid "Please insert a disc in the drive:" msgstr "Silakan masukan cakram ke dalam penggerak" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Paket rusak" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menghitung pemutakhiran" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Kesalahan membuktikan keabsahan beberapa paket" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat menginstal '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Tidak dapat menebak meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -747,25 +747,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Lanjutkan Upgrade" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Simpan" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Ganti" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Laporkan Bug" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Mulai Ulang Sekarang" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Lanjutkan Upgrade" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Lanjutkan Upgrade" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Tidak dapat menemukan catatan luncuran" diff --git a/po/it.po b/po/it.po index 19ee6648..2ef73f9f 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -153,11 +153,11 @@ msgstr "Inserire un nome per il disco" msgid "Please insert a disc in the drive:" msgstr "Inserire un disco nell'unità:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Pacchetti non integri" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -166,20 +166,20 @@ msgstr "" "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get" "\" per risolvere il probelma." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Impossibile aggiornare i meta-pacchetti richiesti" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'aggiornamento" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Errore nell'autenticare alcuni pacchetti" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Impossibile installare \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -759,25 +759,39 @@ msgid "Terminal" msgstr "Terminale" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Riprendi aggiornamento" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Mantieni" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Sostituisci" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Notifica bug" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Riavvia ora" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Riprendi aggiornamento" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Riprendi aggiornamento" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Impossibile trovare le note di rilascio" diff --git a/po/ja.po b/po/ja.po index 1a4d0e71..93bd60c3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu Japanese Team \n" @@ -150,11 +150,11 @@ msgstr "ディスク名を入力してください" msgid "Please insert a disc in the drive:" msgstr "ディスクをドライブに挿入してください:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "壊れたパッケージ" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,20 +162,20 @@ msgstr "" "システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま" "す。 Synaptic や apt-get を使って最初に修正してください。" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "要求されたメタパッケージがアップグレードできません" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "必須パッケージが削除されます" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "アップグレードが算定できません" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "いくつかのパッケージが認証されませんでした" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "'%s' がインストールできません" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "メタパッケージを推測できません" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -741,25 +741,39 @@ msgid "Terminal" msgstr "端末" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "アップグレードを再開する(_R)" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "そのまま(_K)" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "置き換える(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "バグを報告する(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "すぐに再起動(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "アップグレードを再開する(_R)" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "アップグレードを再開する(_R)" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "リリースノートが見つかりません" diff --git a/po/ka.po b/po/ka.po index 2beae0f1..2d4facdb 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian \n" @@ -151,11 +151,11 @@ msgstr "შეიყვანეთ დისკის სახელი" msgid "Please insert a disc in the drive:" msgstr "მოათავსეთ დისკი დისკწამყვანში:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "გაფუჭებული პაკეტები" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,22 +164,22 @@ msgstr "" "პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და " "შემდეგ გააგრძელეთ." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 #, fuzzy msgid "A essential package would have to be removed" msgstr "A არსებითი -სკენ" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 #, fuzzy msgid "Could not calculate the upgrade" msgstr "არა" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "'%s' ვერ დაყენდა" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "მეტა-პაკეტი ვერ გამოვიცანით" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -720,25 +720,39 @@ msgid "Terminal" msgstr "ტერმინალი" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "განახლება _გაგრძელება" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_დატოვე" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_ჩაანაცვლე" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_შეცდომის-ოქმის გაგავნა" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_მყისვე გადატვირთვა" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "განახლება _გაგრძელება" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "განახლება _გაგრძელება" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "ვერ ვპოულობ ვერსიის შენიშვნებს" diff --git a/po/ko.po b/po/ko.po index 9f8df151..d04ccfa3 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl \n" "Language-Team: Korean \n" @@ -146,11 +146,11 @@ msgstr "디스크에 사용할 이름을 입력하십시오." msgid "Please insert a disc in the drive:" msgstr "드라이브에 디스크를 넣으십시오:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "망가진 꾸러미" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -158,20 +158,20 @@ msgstr "" "이 소프트웨어로 수정할 수 없는 망가진 꾸러미가 있습니다. 진행 전에 먼저 시냅" "틱이나 apt-get을 사용하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "요청된 메타 꾸러미를 업그레이드 할 수 없습니다" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "필수 꾸러미를 지워야만 합니다." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "꾸러미 인증 오류" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "'%s'을(를) 설치할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "요청된 꾸러미를 설치할 수 없습니다. 버그로 보고하여 주십시오. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "메타 꾸러미를 추측할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -735,25 +735,39 @@ msgid "Terminal" msgstr "터미널" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "업그레이드 계속(_R)" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "유지(_K)" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "바꾸기(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "버그 보고(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "지금 바로 재시작(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "업그레이드 계속(_R)" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "업그레이드 계속(_R)" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "릴리즈 정보를 찾을 수 없습니다." diff --git a/po/ku.po b/po/ku.po index 31740c00..7a35595a 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -142,30 +142,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Paketên şikestî" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Nikarî '%s' saz bike" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -670,25 +670,37 @@ msgid "Terminal" msgstr "Termînal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +msgid "_Cancel Upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "Bi_parêze" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/lt.po b/po/lt.po index bd7f8252..593ffc55 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" @@ -147,11 +147,11 @@ msgstr "Įveskite disko pavadinimą" msgid "Please insert a disc in the drive:" msgstr "Įdėkite diską į įrenginį:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Sugadinti paketai" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,20 +160,20 @@ msgstr "" "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi „synaptic“ " "arba „apt-get“." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Negalima atnaujinti reikiamų metapaketų" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Nepavyko paskaičiuoti atnaujinimo" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Klaida autentikuojant keletą paketų" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 #, fuzzy msgid "Can't guess meta-package" msgstr "Negalima nuspėti meta paketo" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -741,25 +741,39 @@ msgid "Terminal" msgstr "Terminalas" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Tęsti atnaujinimą" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Palikti" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "Pa_keisti" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Pranešti apie klaidą" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Perkrauti dabar" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Tęsti atnaujinimą" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Tęsti atnaujinimą" + #: ../UpdateManager/DistUpgradeFetcher.py:68 #, fuzzy msgid "Could not find the release notes" diff --git a/po/mk.po b/po/mk.po index 06b8b8bb..6ab5bb52 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -149,30 +149,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -692,26 +692,38 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "Освежи" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/ms.po b/po/ms.po index 6c9c8b03..99f40fc6 100644 --- a/po/ms.po +++ b/po/ms.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux \n" "Language-Team: Malay \n" @@ -148,11 +148,11 @@ msgstr "Sila masukkan nama untuk cakera padat" msgid "Please insert a disc in the drive:" msgstr "Sila masukkan cakera padat kedalam pemacu" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Pakej rosak" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,20 +161,20 @@ msgstr "" "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-get " "sebelum meneruskan." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menjangka penaikkan taraf" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Pakej meta tidak dapat diduga." -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -711,25 +711,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/nb.po b/po/nb.po index 7741c9c1..a6d35c5b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" @@ -149,11 +149,11 @@ msgstr "Vennligst oppgi et navn for platen" msgid "Please insert a disc in the drive:" msgstr "Vennligst sett inn en plate i CD-spilleren:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Skadede pakker" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke oppgradere nødvendige meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Kunne ikke autentisere noen pakker" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Kan ikke gjette på meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -752,25 +752,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Gjenoppta oppgradering" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Ta vare på" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Erstatt" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Rapportér en feil" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Omstart nå" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Gjenoppta oppgradering" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Gjenoppta oppgradering" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Kunne ikke finne utgivelsesnotatene" diff --git a/po/ne.po b/po/ne.po index 7b136f19..7f90a344 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -147,30 +147,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -682,26 +682,38 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "फेरि लोड गर्नुहोस" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/nl.po b/po/nl.po index 4ebdacdf..eddb1098 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" @@ -149,11 +149,11 @@ msgstr "Geef het cd-schijfje een naam" msgid "Please insert a disc in the drive:" msgstr "Plaats een schijf in de speler:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Niet-werkende pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,20 +162,20 @@ msgstr "" "met deze software. Repareer deze eerst met synaptic of apt-get voordat u " "verder gaat." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Kan de vereiste meta-pakketten niet upgraden." -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Kan de vereisten voor de upgrade niet berekenen" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Fout bij het bepalen van de echtheid van sommige pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Kan '%s' niet installeren" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Kan het meta-pakket niet raden" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -757,25 +757,39 @@ msgid "Terminal" msgstr "Terminalvenster" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Upgrade hervatten" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Behouden" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Vervangen" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Fout rapporteren" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Nu herstarten" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Upgrade hervatten" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Upgrade hervatten" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Kon de versie-informatie niet vinden" diff --git a/po/no.po b/po/no.po index 3b153941..79473bf7 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -147,30 +147,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -685,26 +685,38 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "Oppdater" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/oc.po b/po/oc.po index 0313725c..4e9b78bc 100644 --- a/po/oc.po +++ b/po/oc.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" @@ -149,30 +149,30 @@ msgstr "Picatz un nom pel disc" msgid "Please insert a disc in the drive:" msgstr "Metètz un disc dins lo legidor :" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Paquetatges corromputs" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Impossible calcular la mesa a jorn" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Impossible installar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -677,25 +677,37 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Remplaçar" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Tornar aviar ara" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/pa.po b/po/pa.po index cf757aba..1882b66a 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -144,30 +144,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -673,26 +673,40 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 #, fuzzy msgid "_Resume Upgrade" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/pl.po b/po/pl.po index 90cf55e8..1f4e801b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Polish \n" @@ -148,11 +148,11 @@ msgstr "Proszę podać nazwę dla płyty" msgid "Please insert a disc in the drive:" msgstr "Proszę włożyć płytę do napędu:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Uszkodzone pakiety" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,20 +161,20 @@ msgstr "" "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub " "apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Nie można zaktualizować wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Błąd podczas uwierzytelniania niektórych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Nie można zainstalować \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -752,25 +752,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Wznów aktualizację" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Zachowaj" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "Zas_tąp" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "Zgłoś _błąd" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Uruchom ponownie" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Wznów aktualizację" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Wznów aktualizację" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Nie można było odnaleźć informacji o wydaniu" diff --git a/po/pt.po b/po/pt.po index 3767421c..3d9defe6 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho \n" "Language-Team: Ubuntu Portuguese Team \n" @@ -147,11 +147,11 @@ msgstr "Por favor introduza um nome para o disco" msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Pacotes Quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,20 +160,20 @@ msgstr "" "este software. Por favor corrija-os usando o synaptic ou apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível actualizar os meta-pacotes necessários" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Impossível de calcular a actualização" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Impossível de instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Impossível de descobrir meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -752,25 +752,39 @@ msgid "Terminal" msgstr "Consola" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Retomar Actualização?" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Manter" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Substituir" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Reportar um erro" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Reiniciar agora" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Retomar Actualização?" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Retomar Actualização?" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Impossível de encontrar notas de lançamento" diff --git a/po/pt_BR.po b/po/pt_BR.po index fe604df0..6e938da5 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-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut \n" "Language-Team: Ubuntu-BR \n" @@ -151,11 +151,11 @@ msgstr "Por favor digite um nome para o disco" msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Pacotes quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,20 +164,20 @@ msgstr "" "programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes " "de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível atualizar os meta-pacotes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Não foi possível adivinhar o meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -754,25 +754,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "Continua_r Atualização" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Manter" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Subtituir" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "Reportar _Erro" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Reiniciar Agora" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "Continua_r Atualização" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "Continua_r Atualização" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Não foi possível encontrar as notas de lançamento" diff --git a/po/ro.po b/po/ro.po index 6329559e..1cf0af50 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" @@ -153,12 +153,12 @@ msgstr "Introduceţi un nume pentru disc" msgid "Please insert a disc in the drive:" msgstr "Introduceţi un disc în unitate:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 #, fuzzy msgid "Broken packages" msgstr "Pachete deteriorate" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 #, fuzzy msgid "" "Your system contains broken packages that couldn't be fixed with this " @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 #, fuzzy msgid "Error authenticating some packages" msgstr "Eroare la autentificarea unor pachete." -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Nu pot instala '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -696,25 +696,39 @@ msgid "Terminal" msgstr "Terminal" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Continuă Actualizarea" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Continuă Actualizarea" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Continuă Actualizarea" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/ru.po b/po/ru.po index f9e9eced..433c6f3c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -148,11 +148,11 @@ msgstr "Введите название для диска" msgid "Please insert a disc in the drive:" msgstr "Пожалуйста, вставьте диск в привод:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Поврежденные пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,20 +161,20 @@ msgstr "" "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-get, " "прежде чем продолжить." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Невозможно обновить требуемые мета-пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "Будет удален необходимый пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Невозможно подготовить обновление системы" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Ошибка при проверке подлинности некоторых пакетов" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Невозможно установить '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Невозможно подобрать мета-пакет" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -749,25 +749,39 @@ msgid "Terminal" msgstr "Терминал" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Продолжить обновление" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Оставить" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Заменить" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Отправить сообщение об ошибке" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "Перезапустить _сейчас" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Продолжить обновление" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Продолжить обновление" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Не могу найти сведения о релизе" diff --git a/po/rw.po b/po/rw.po index 292d629b..6111ed83 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -155,30 +155,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -687,27 +687,41 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "Byarangiye" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "Kongera Gutangiza" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 #, fuzzy msgid "_Resume Upgrade" msgstr "Byarangiye" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "Byarangiye" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/sk.po b/po/sk.po index 9cf1a5b6..a046cb04 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" @@ -148,11 +148,11 @@ msgstr "Prosím, zadajte názov disku" msgid "Please insert a disc in the drive:" msgstr "Prosím, vložte disk do mechaniky:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Poškodené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Nemôžem aktualizovať požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Nemôžem vypočítať aktualizáciu" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíkov" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Nemôžem inštalovať '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nemôžem odhadnúť meta balík." -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -749,25 +749,39 @@ msgid "Terminal" msgstr "Terminál" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Pokračovať v aktualizácii" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Ponechať" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Nahradiť" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Oznámiť chybu" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Reštartovať teraz" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Pokračovať v aktualizácii" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_Pokračovať v aktualizácii" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Nebolo možné nájsť poznámky k vydaniu" diff --git a/po/sr.po b/po/sr.po index b8d0b45e..b1957968 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic \n" "Language-Team: Serbian \n" @@ -143,30 +143,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -673,25 +673,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/sv.po b/po/sv.po index 56dd66ab..6537d617 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors \n" "Language-Team: Swedish \n" @@ -151,11 +151,11 @@ msgstr "Skriv in ett namn på skivan" msgid "Please insert a disc in the drive:" msgstr "Sätt in en skiva i enheten:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Trasiga paket" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,20 +164,20 @@ msgstr "" "programmet. Reparera dem först med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Kan inte uppdatera obligatoriska meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 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:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Kunde inte beräkna uppdateringen" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisiera vissa paket" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Kan inte installera \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Kan inte gissa meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -753,25 +753,40 @@ msgid "Terminal" msgstr "Terminalfönster" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_Återuppta uppgraderingen" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +#, fuzzy +msgid "_Continue" +msgstr "Fortsätt" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_Behåll" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "_Ersätt" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_Rapportera bugg" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Starta om nu" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_Återuppta uppgraderingen" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "Distribution:" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "Det gick inte att hitta versionsinformation" @@ -2465,9 +2480,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Required Removals" #~ msgstr "Nödvändiga borttagningar" -#~ msgid "Continue" -#~ msgstr "Fortsätt" - #~ msgid "Package" #~ msgstr "Paket" diff --git a/po/th.po b/po/th.po index d8db8415..f90a2d0b 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" @@ -145,11 +145,11 @@ msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิ msgid "Please insert a disc in the drive:" msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "แพกเกจเสียหาย" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -157,20 +157,20 @@ msgstr "" "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic " "หรือ apt-get ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "แพจเกจที่สำคัญจะถูกลบออก" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "ไม่สามารถคำนวนการปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "ไม่สามารถติดตั้ง '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -722,25 +722,39 @@ msgid "Terminal" msgstr "เทอร์มินัล" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "_คงไว้" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "แ_ทนที่" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "_ส่งรายงานปัญหา" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "เ_ริ่มระบบใหม่เดี๋ยวนี้" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "ไม่สามารถหาบันทึกการปล่อย" diff --git a/po/tr.po b/po/tr.po index eb70d9f4..24f41801 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI \n" "Language-Team: Turkish \n" @@ -146,11 +146,11 @@ msgstr "Lütfen disk için bir isim girin" msgid "Please insert a disc in the drive:" msgstr "Lütfen sürücüye bir disk yerleştirin:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Bozuk paketler" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -158,20 +158,20 @@ msgstr "" "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:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "'%s' yüklenemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -689,25 +689,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/uk.po b/po/uk.po index 00cc865e..948bd485 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff \n" "Language-Team: Ukrainian \n" @@ -145,11 +145,11 @@ msgstr "Введіть назву диску" msgid "Please insert a disc in the drive:" msgstr "Вставте диск в пристрій:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "Пошкоджені пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -157,20 +157,20 @@ msgstr "" "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені " "цією програмою. Скористайтесь перш програмами synaptic чи apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "Не можливо поновити необхідні meta-пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "Це призведе довидалення базового пакунку системи" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Не можливо розрахувати поновлення" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Помилка підписів в деяких пакунках" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -709,26 +709,40 @@ msgid "Terminal" msgstr "Термінал" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "П_родовжити апгрейд системи" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "Перезавантажити" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "П_овідомити про помилку" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "_Перезавантажити" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "П_родовжити апгрейд системи" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "П_родовжити апгрейд системи" + #: ../UpdateManager/DistUpgradeFetcher.py:68 #, fuzzy msgid "Could not find the release notes" diff --git a/po/update-manager.pot b/po/update-manager.pot index 2909b623..345bc877 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-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -142,30 +142,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -669,25 +669,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/ur.po b/po/ur.po index 25649bf5..c3bfe406 100644 --- a/po/ur.po +++ b/po/ur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -143,30 +143,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -670,25 +670,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/urd.po b/po/urd.po index 65f63c08..0785bdeb 100644 --- a/po/urd.po +++ b/po/urd.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -143,30 +143,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -670,25 +670,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/vi.po b/po/vi.po index e42aa10e..86dc3aea 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" @@ -144,30 +144,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -676,26 +676,38 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "Tải lại" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/xh.po b/po/xh.po index 6e7a0566..4afa8fb2 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -143,30 +143,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -670,25 +670,37 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Replace" +msgid "_Continue" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 -msgid "_Report Bug" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:19 -msgid "_Restart Now" +msgid "_Replace" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index a9a8830d..00acfbf0 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-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_CN \n" @@ -151,11 +151,11 @@ msgstr "请输入光盘的名称" msgid "Please insert a disc in the drive:" msgstr "请将光盘插入到光驱里:" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "破损的软件包" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -163,20 +163,20 @@ msgstr "" "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者" "apt-get修复它们。" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "不能升级要求的元包" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "一个必要的软件包会被删除" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "无法计算升级" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "在认证一些软件包时出错" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "无法安装'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "无法安装要求的软件包。请汇报这个bug。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "无法猜出元包" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -717,25 +717,39 @@ msgid "Terminal" msgstr "终端" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "继续升级(_R)" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "维持原状(_K)" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "替换(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "报告Bug(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "现在重启(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "继续升级(_R)" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "继续升级(_R)" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "无法找到发行说明" diff --git a/po/zh_HK.po b/po/zh_HK.po index 29847de7..2f54ef54 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-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -144,30 +144,30 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 #, 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:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 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 " @@ -679,26 +679,38 @@ msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Keep" +msgid "_Cancel Upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 #, fuzzy msgid "_Replace" msgstr "重新載入" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +msgid "_Start Upgrade" +msgstr "" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2c0cd116..4a83550e 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-29 17:00+0200\n" +"POT-Creation-Date: 2006-10-02 14:45+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan \n" "Language-Team: Chinese (Taiwan) \n" @@ -144,11 +144,11 @@ msgstr "請輸入光碟的名稱" msgid "Please insert a disc in the drive:" msgstr "請將光碟放入光碟機：" -#: ../DistUpgrade/DistUpgradeCache.py:92 +#: ../DistUpgrade/DistUpgradeCache.py:91 msgid "Broken packages" msgstr "不完整套件" -#: ../DistUpgrade/DistUpgradeCache.py:93 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -156,20 +156,20 @@ msgstr "" "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 " "synaptic 或 apt-get 來修恢它們。" -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" msgstr "無法升級須要的元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:193 +#: ../DistUpgrade/DistUpgradeCache.py:217 msgid "A essential package would have to be removed" msgstr "將會移除的核心套件" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:196 +#: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "無法計算升級" -#: ../DistUpgrade/DistUpgradeCache.py:197 +#: ../DistUpgrade/DistUpgradeCache.py:221 #, 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:222 +#: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" -#: ../DistUpgrade/DistUpgradeCache.py:223 +#: ../DistUpgrade/DistUpgradeCache.py:247 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:288 +#: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format msgid "Can't install '%s'" msgstr "無法安裝‘%s’" -#: ../DistUpgrade/DistUpgradeCache.py:289 +#: ../DistUpgrade/DistUpgradeCache.py:313 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "無法安裝須要的套件，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:296 +#: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:297 +#: ../DistUpgrade/DistUpgradeCache.py:321 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -710,25 +710,39 @@ msgid "Terminal" msgstr "終端" #: ../DistUpgrade/DistUpgrade.glade.h:16 +#, fuzzy +msgid "_Cancel Upgrade" +msgstr "繼續升級(_R)" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 msgid "_Keep" msgstr "保留(_K)" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Replace" msgstr "取代(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Report Bug" msgstr "報告錯誤(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:19 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Restart Now" msgstr "現在重新啟動(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:20 +#: ../DistUpgrade/DistUpgrade.glade.h:22 msgid "_Resume Upgrade" msgstr "繼續升級(_R)" +#: ../DistUpgrade/DistUpgrade.glade.h:23 +#, fuzzy +msgid "_Start Upgrade" +msgstr "繼續升級(_R)" + #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "無法找到發行說明" -- cgit v1.2.3 From 7e0a76008e37d04416a7c2a5c5280864b4bf7649 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Oct 2006 20:48:13 +0200 Subject: * added missing python-vte dependency --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a8c8c707..046c9008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.44.15) edgy; urgency=low + + * added missing python-vte dependency (lp: #63609) + + -- + update-manager (0.44.14) edgy; urgency=low * fix some incorrect i18n markings (lp: #62681) diff --git a/debian/control b/debian/control index e3c72b8d..f2fe41c3 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: update-manager Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus +Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus, python-vte Recommends: python-gnome2 Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user -- cgit v1.2.3 From b83fcc42a4370fae179c143b371029556306d6d5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Oct 2006 20:49:41 +0200 Subject: * added missing gksu dependency (this should become a recommends later) --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 046c9008..1493bbef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ update-manager (0.44.15) edgy; urgency=low * added missing python-vte dependency (lp: #63609) + * added missing gksu dependency (lp: #63572) -- diff --git a/debian/control b/debian/control index f2fe41c3..7ed4c7a5 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: update-manager Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus, python-vte +Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus, python-vte, gksu Recommends: python-gnome2 Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user -- cgit v1.2.3 From 34083e823a767755aa55a202f037d83e085fc3d5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 11:55:07 +0200 Subject: * DistUpgrade/DistUpgrade.cfg: - don't auto-remove xchat --- DistUpgrade/DistUpgrade.cfg | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index b25def9a..c83f9014 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -20,7 +20,7 @@ KeepInstalledSection=translations [ubuntu-desktop] KeyDependencies=gdm, gnome-panel, ubuntu-artwork # those pkgs will be marked remove right after the distUpgrade in the cache -PostUpgradeRemove=xchat, xscreensaver +PostUpgradeRemove=xscreensaver [kubuntu-desktop] KeyDependencies=kdm, kicker, kubuntu-artwork-usplash diff --git a/debian/changelog b/debian/changelog index 1493bbef..3f23a557 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ update-manager (0.44.15) edgy; urgency=low * added missing python-vte dependency (lp: #63609) * added missing gksu dependency (lp: #63572) + * don't remove xchat automatically anymore on upgrade (leftover + from breezy->dapper) (lp: #63881) -- -- cgit v1.2.3 From 636b6a1241f1317f95d0f9a9de87355f4c81b0c6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 12:09:32 +0200 Subject: * UpdateManager/UpdateManager.py: - only show the dist-upgrade dialog if anything would have to be delted --- UpdateManager/UpdateManager.py | 6 ++++-- debian/changelog | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 1a4c7c40..ab1d8a95 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -114,10 +114,12 @@ class MyCache(apt.Cache): def saveDistUpgrade(self): """ this functions mimics a upgrade but will never remove anything """ self._depcache.Upgrade(True) + wouldDelete = self._depcache.DelCount if self._depcache.DelCount > 0: self.clear() assert self._depcache.BrokenCount == 0 and self._depcache.DelCount == 0 self._depcache.Upgrade() + return wouldDelete def get_changelog(self, name, lock): # don't touch the gui in this function, it needs to be thread-safe @@ -250,7 +252,7 @@ class UpdateList: self.held_back = [] # do the upgrade - cache.saveDistUpgrade() + self.distUpgradeWouldDelete = cache.saveDistUpgrade() # sort by origin for pkg in cache: @@ -911,7 +913,7 @@ class UpdateManager(SimpleGladeApp): def check_all_updates_installable(self): """ Check if all available updates can be installed and suggest to run a distribution upgrade if not """ - if self.list.keepcount > 0: + if self.list.distUpgradeWouldDelete > 0: self.dialog_dist_upgrade.set_transient_for(self.window_main) res = self.dialog_dist_upgrade.run() self.dialog_dist_upgrade.hide() diff --git a/debian/changelog b/debian/changelog index 3f23a557..fcd765db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ update-manager (0.44.15) edgy; urgency=low * added missing gksu dependency (lp: #63572) * don't remove xchat automatically anymore on upgrade (leftover from breezy->dapper) (lp: #63881) + * do not come up with bogus dist-upgrade suggestions -- -- cgit v1.2.3 From b471fffffd13becd2425e65a22c0ba74668e8808 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 12:38:02 +0200 Subject: * DistUpgrade/DistUpgradeViewGtk.py: - fix for bad grammar --- DistUpgrade/DistUpgradeViewGtk.py | 5 +++-- debian/changelog | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 1744a0f2..e77fe858 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -200,8 +200,9 @@ class GtkInstallProgressAdapter(InstallProgress): logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) #self.expander.set_expanded(True) prim = _("Replace the customized configuration file\n'%s'?") % current - sec = _("You will lose any local changes to this file " - "if you replace this file with the latest version.") + sec = _("You will lose any changes you have made to this " + "configuration file if you choose to replace it with " + "a newer version.") markup = "%s \n\n%s" % (prim, sec) self.parent.label_conffile.set_markup(markup) self.parent.dialog_conffile.set_transient_for(self.parent.window_main) diff --git a/debian/changelog b/debian/changelog index fcd765db..eecc7ff5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ update-manager (0.44.15) edgy; urgency=low * don't remove xchat automatically anymore on upgrade (leftover from breezy->dapper) (lp: #63881) * do not come up with bogus dist-upgrade suggestions + * fix bad english grammar (lp: #63761) -- -- cgit v1.2.3 From 533db41cd76a89a2a893c00980e537d3af34c769 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 12:45:51 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - fix incorrect variable name --- DistUpgrade/DistUpgradeCache.py | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 3d10c707..01305d32 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -177,7 +177,7 @@ class MyCache(apt.Cache): self.markInstall(basepkg, "python2.4->python upgrade rule") except SystemError, e: - logging.debug("Failed to apply python2.4->python install: %s (%s)" % (newpkg, e)) + logging.debug("Failed to apply python2.4->python install: %s (%s)" % (basepkg, e)) # deal with *gar*gar* hpijs if (self.has_key("hpijs") and self["hpijs"].isInstalled and not self["hpijs"].markedUpgrade): diff --git a/debian/changelog b/debian/changelog index eecc7ff5..8a5fe80a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ update-manager (0.44.15) edgy; urgency=low from breezy->dapper) (lp: #63881) * do not come up with bogus dist-upgrade suggestions * fix bad english grammar (lp: #63761) + * fix in the edgyUpdates quirks handler (lp: #63723) -- -- cgit v1.2.3 From e6d17f29049c81ea4064dd928b026ef68726354d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 13:17:16 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - catch systemerror exceptions in _tryMarkObsoleteForRemoval() --- DistUpgrade/DistUpgradeCache.py | 23 ++++++++++++++--------- debian/changelog | 1 + 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 01305d32..1a7911c0 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -307,8 +307,8 @@ class MyCache(apt.Cache): logging.debug("guessing '%s' as missing meta-pkg" % key) try: self[key].markInstall() - except SystemError: - logging.error("failed to mark '%s' for install" % key) + except SystemError, e: + logging.error("failed to mark '%s' for install (%s)" % (key,e)) view.error(_("Can't install '%s'" % key), _("It was impossible to install a " "required package. Please report " @@ -340,13 +340,18 @@ class MyCache(apt.Cache): # if it dosn't remove other packages depending on it # that are not obsolete as well self.create_snapshot() - self[pkgname].markDelete() - for pkg in self.getChanges(): - if pkg.name not in remove_candidates or \ - pkg.name in foreign_pkgs or \ - self._inRemovalBlacklist(pkg.name): - self.restore_snapshot() - return False + try: + self[pkgname].markDelete() + for pkg in self.getChanges(): + if pkg.name not in remove_candidates or \ + pkg.name in foreign_pkgs or \ + self._inRemovalBlacklist(pkg.name): + self.restore_snapshot() + return False + except SystemError,e: + loggging.warning("_tryMarkObsoleteForRemoval failed for '%s' (%s)" % (pkgname,e)) + self.restore_snapshot() + return False return True def _getObsoletesPkgs(self): diff --git a/debian/changelog b/debian/changelog index 8a5fe80a..c078cfc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ update-manager (0.44.15) edgy; urgency=low * do not come up with bogus dist-upgrade suggestions * fix bad english grammar (lp: #63761) * fix in the edgyUpdates quirks handler (lp: #63723) + * catch error from _tryMarkObsoleteForRemoval() (lp: #63617) -- -- cgit v1.2.3 From ab2952e77ef993eff352295ba981e22ec6a1008f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 14:05:41 +0200 Subject: * po/pl.po, po/ro.po: - fix plural forms * SoftwareProperties/SoftwareProperties.py: - xml-escape comments before rendering them on a gtktreeview --- SoftwareProperties/SoftwareProperties.py | 6 +++--- debian/changelog | 2 ++ po/pl.po | 4 ++-- po/ro.po | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 14ddeefc..983a8cce 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -33,8 +33,7 @@ from gettext import gettext as _ import os import string import re - -#sys.path.append("@prefix/share/update-manager/python") +from xml.sax.saxutils import escape from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp from UpdateManager.Common.HelpViewer import HelpViewer @@ -46,6 +45,7 @@ import dialog_add_sources_list from dialog_apt_key import apt_key from utils import * + (LIST_MARKUP, LIST_ENABLED, LIST_ENTRY_OBJ) = range(3) CONF_MAP = { @@ -701,7 +701,7 @@ class SoftwareProperties(SimpleGladeApp): if source.template == None: if source.comment: - contents = "%s" % source.comment + contents = "%s" % escape(source.comment) # Only show the components if there are more than one if len(source.comps) > 1: for c in source.comps: diff --git a/debian/changelog b/debian/changelog index c078cfc8..cfc806ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ update-manager (0.44.15) edgy; urgency=low * fix bad english grammar (lp: #63761) * fix in the edgyUpdates quirks handler (lp: #63723) * catch error from _tryMarkObsoleteForRemoval() (lp: #63617) + * fix plural forms for ro, pl (lp: #46421) + * properly escape comments before displaying them (lp: #63475) -- diff --git a/po/pl.po b/po/pl.po index ef473e6a..26856cee 100644 --- a/po/pl.po +++ b/po/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" diff --git a/po/ro.po b/po/ro.po index 306fe47f..0bd1db76 100644 --- a/po/ro.po +++ b/po/ro.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n %\n" +"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?1:2)\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" -- cgit v1.2.3 From be3c5263985338a286e959add9fd618ba7f1d99e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 14:13:06 +0200 Subject: * data/channels/Ubuntu.info.in: - akward grammar --- data/channels/Ubuntu.info | 22 +++++++++++----------- data/channels/Ubuntu.info.in | 8 ++++---- debian/changelog | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info index 4588a9b1..2908e85b 100644 --- a/data/channels/Ubuntu.info +++ b/data/channels/Ubuntu.info @@ -8,7 +8,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.10 'Edgy Eft' Component: main CompDescription: Officially supported -CompDescriptionLong: By Canonical supported Open Source software +CompDescriptionLong: Canonical supported Open Source software Component: universe CompDescription: Community maintained CompDescriptionLong: Community maintained Open Source software @@ -17,7 +17,7 @@ CompDescription: Non-free drivers CompDescriptionLong: Proprietary drivers for devices Component: multiverse CompDescription: Restricted software -CompDescriptionLong: By copyright or legal issues restricted software +CompDescriptionLong: Software restricted by copyright or legal issues Suite: edgy MatchName: .* @@ -25,7 +25,7 @@ BaseURI: cdrom:\[Ubuntu.*6.10 Description: Cdrom with Ubuntu 6.10 'Edgy Eft' Available: False Component: main -CompDescription: Oficially supported +CompDescription: Officially supported Component: restricted CompDescription: Restricted copyright @@ -59,7 +59,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main CompDescription: Officially supported -CompDescriptionLong: By Canonical supported Open Source software +CompDescriptionLong: Canonical supported Open Source software Component: universe CompDescription: Community maintained (universe) CompDescriptionLong: Community maintained Open Source software @@ -68,7 +68,7 @@ CompDescription: Non-free drivers CompDescriptionLong: Proprietary drivers for devices Component: multiverse CompDescription: Restricted software (Multiverse) -CompDescriptionLong: By copyright or legal issues restricted software +CompDescriptionLong: Software restricted by copyright or legal issues Suite: dapper MatchName: .* @@ -76,7 +76,7 @@ BaseURI: cdrom:\[Ubuntu.*6.06 Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' Available: False Component: main -CompDescription: Oficially supported +CompDescription: Officially supported Component: restricted CompDescription: Restricted copyright @@ -123,7 +123,7 @@ BaseURI: cdrom:\[Ubuntu.*5.10 Description: Cdrom with Ubuntu 5.10 'Breezy Badger' Available: False Component: main -CompDescription: Oficially supported +CompDescription: Officially supported Component: restricted CompDescription: Restricted copyright @@ -151,7 +151,7 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main -CompDescription: Oficially supported +CompDescription: Officially supported Component: restricted CompDescription: Restricted copyright Component: universe @@ -165,7 +165,7 @@ BaseURI: cdrom:\[Ubuntu.*5.04 Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' Available: False Component: main -CompDescription: Oficially supported +CompDescription: Officially supported Component: restricted CompDescription: Restricted copyright @@ -192,7 +192,7 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 'Warty Warthog' Component: main -CompDescription: No longer oficially supported +CompDescription: No longer officially supported Component: restricted CompDescription: Restricted copyright Component: universe @@ -206,7 +206,7 @@ BaseURI: cdrom:\[Ubuntu.*4.10 Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main -CompDescription: No longer oficially supported +CompDescription: No longer officially supported Component: restricted CompDescription: Restricted copyright diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index 1afc66c9..f3cce4f7 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -8,7 +8,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.10 'Edgy Eft' Component: main _CompDescription: Officially supported -_CompDescriptionLong: By Canonical supported Open Source software +_CompDescriptionLong: Canonical supported Open Source software Component: universe _CompDescription: Community maintained _CompDescriptionLong: Community maintained Open Source software @@ -17,7 +17,7 @@ _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse _CompDescription: Restricted software -_CompDescriptionLong: By copyright or legal issues restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues Suite: edgy MatchName: .* @@ -59,7 +59,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main _CompDescription: Officially supported -_CompDescriptionLong: By Canonical supported Open Source software +_CompDescriptionLong: Canonical supported Open Source software Component: universe _CompDescription: Community maintained (universe) _CompDescriptionLong: Community maintained Open Source software @@ -68,7 +68,7 @@ _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse _CompDescription: Restricted software (Multiverse) -_CompDescriptionLong: By copyright or legal issues restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues Suite: dapper MatchName: .* diff --git a/debian/changelog b/debian/changelog index cfc806ce..6bedba40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ update-manager (0.44.15) edgy; urgency=low * don't remove xchat automatically anymore on upgrade (leftover from breezy->dapper) (lp: #63881) * do not come up with bogus dist-upgrade suggestions - * fix bad english grammar (lp: #63761) + * fix bad english grammar (lp: #63761, #63474) * fix in the edgyUpdates quirks handler (lp: #63723) * catch error from _tryMarkObsoleteForRemoval() (lp: #63617) * fix plural forms for ro, pl (lp: #46421) -- cgit v1.2.3 From 408753014a2ffe1c52a0941e9db10b912e69a6ab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 21:26:42 +0200 Subject: * DistUpgrade/DistUpgradeView.py: - show the dsl download time first and then the modem time --- DistUpgrade/DistUpgradeView.py | 4 ++-- debian/changelog | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index a9cd16d7..40617774 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -35,8 +35,8 @@ def estimatedDownloadTime(requiredDownload): """ get the estimated download time """ timeModem = requiredDownload/(56*1024/8) # 56 kbit timeDSL = requiredDownload/(1024*1024/8) # 1Mbit = 1024 kbit - s= _("This download will take about %s with a 56k modem and about %s with " - "a 1Mbit DSL connection" % (FuzzyTimeToStr(timeModem), FuzzyTimeToStr(timeDSL))) + s= _("This download will take about %s with a 1Mbit DSL connection " + "and about %s with a 56k modem" % (FuzzyTimeToStr(timeDSL),FuzzyTimeToStr(timeModem))) return s diff --git a/debian/changelog b/debian/changelog index 6bedba40..afc3c0a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ update-manager (0.44.15) edgy; urgency=low * fix plural forms for ro, pl (lp: #46421) * properly escape comments before displaying them (lp: #63475) - -- + -- Michael Vogt Wed, 4 Oct 2006 21:10:40 +0200 update-manager (0.44.14) edgy; urgency=low -- cgit v1.2.3 From cab619af6ad5ce8f2ed9d599e54bfad8d57c3f60 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Oct 2006 15:32:03 +0200 Subject: * UpdateManager/UpdateManager.py: - fix proxy usage (fetch it from gconf) --- UpdateManager/UpdateManager.py | 19 ++++++++++++++++++- debian/changelog | 6 ++++++ 2 files changed, 24 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index ab1d8a95..6fed3517 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -383,10 +383,27 @@ class UpdateManager(SimpleGladeApp): self.button_help.set_sensitive(False) self.gconfclient = gconf.client_get_default() + self.init_proxy() + # restore state self.restore_state() self.window_main.show() + def init_proxy(self): + if os.getenv("http_proxy"): + return + if self.gconfclient.get_bool("/system/http_proxy/use_http_proxy"): + host = self.gconfclient.get_string("/system/http_proxy/host") + port = self.gconfclient.get_int("/system/http_proxy/port") + use_auth = self.gconfclient.get_bool("/system/http_proxy/use_authentication") + if use_auth: + auth_user = self.gconfclient.get_string("/system/http_proxy/authentication_user") + auth_pw = self.gconfclient.get_string("/system/http_proxy/authentication_password") + proxy = "http://%s:%s@%s:%s/" % (auth_user,auth_pass,host, port) + else: + proxy = "http://%s:%s/" % (host, port) + os.putenv("http_proxy",proxy) + def header_column_func(self, cell_layout, renderer, model, iter): pkg = model.get_value(iter, LIST_PKG) if pkg == None: @@ -836,7 +853,7 @@ class UpdateManager(SimpleGladeApp): dialog.set_markup(msg) dialog.run() dialog.destroy() - + def on_button_dist_upgrade_clicked(self, button): #print "on_button_dist_upgrade_clicked" fetcher = DistUpgradeFetcher(self, self.new_dist) diff --git a/debian/changelog b/debian/changelog index afc3c0a0..4da39b63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.44.16) edgy; urgency=low + + * fix proxy use in user-mode + + -- Michael Vogt Fri, 6 Oct 2006 15:17:37 +0200 + update-manager (0.44.15) edgy; urgency=low * added missing python-vte dependency (lp: #63609) -- cgit v1.2.3 From f086a0da7c5c77ae68797d3b4fbd543222976523 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Oct 2006 23:04:16 +0200 Subject: * UpdateManager/Common/aptsources.py: - fix crash for corner case sources.list layout (lp #64159) * UpdateManager/UpdateManager.py: - get gconf proxy too --- DistUpgrade/Changelog | 2 ++ UpdateManager/Common/aptsources.py | 7 +++++++ UpdateManager/UpdateManager.py | 43 +++++++++++++++++++------------------- debian/changelog | 2 +- 4 files changed, 31 insertions(+), 23 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index bfd8d4bd..ece5feda 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,5 @@ +2006-10-06: + - fix source.list rewrite corner case bug (#64159) 2006-10-04: - improve the space checking/logging 2006-09-29: diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index 06d83e01..34b5b967 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -606,8 +606,15 @@ class Distribution: a repository could be splitted into different apt lines. If not add the component """ + # if we don't that distro, just reutnr (can happen for e.g. + # dapper-update only in deb-src + if not comps_per_dist.has_key(source.dist): + return + # if we have seen this component already for this distro, + # return (nothing to do if comp in comps_per_dist[source.dist]: return + # add it source.comps.append(comp) comps_per_dist[source.dist].add(comp) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 6fed3517..e659843a 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -44,13 +44,13 @@ import string import sys import os import os.path -import urllib2 import re import locale import tempfile import pango import subprocess import pwd +import urllib2 import time import thread import xml.sax.saxutils @@ -355,26 +355,6 @@ class UpdateManager(SimpleGladeApp): self.treeview_update.connect("button-press-event", self.show_context_menu) - # proxy stuff - # FIXME: move this into it's own function - SYNAPTIC_CONF_FILE = "%s/.synaptic/synaptic.conf" % pwd.getpwuid(0)[5] - if os.path.exists(SYNAPTIC_CONF_FILE): - cnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFile(cnf, SYNAPTIC_CONF_FILE) - use_proxy = cnf.FindB("Synaptic::useProxy", False) - if use_proxy: - proxy_host = cnf.Find("Synaptic::httpProxy") - proxy_port = str(cnf.FindI("Synaptic::httpProxyPort")) - if proxy_host and proxy_port: - # FIXME: set the proxy for libapt here as well (e.g. for the - # DistUpgradeFetcher - proxy_support = urllib2.ProxyHandler({"http":"http://%s:%s" % (proxy_host, proxy_port)}) - opener = urllib2.build_opener(proxy_support) - urllib2.install_opener(opener) - # install a proxy environment too - if not os.environ.has_key("http_proxy"): - os.putenv("http_proxy", - "http://%s:%s/" % (proxy_host, proxy_port)) # setup the help viewer and disable the help button if there # is no viewer available @@ -390,9 +370,24 @@ class UpdateManager(SimpleGladeApp): self.window_main.show() def init_proxy(self): + # proxy settings, first check for http_proxy environment (always wins), + # then look into synaptics conffile, then into gconf if os.getenv("http_proxy"): return - if self.gconfclient.get_bool("/system/http_proxy/use_http_proxy"): + SYNAPTIC_CONF_FILE = "%s/.synaptic/synaptic.conf" % pwd.getpwuid(0)[5] + proxy = None + if os.path.exists(SYNAPTIC_CONF_FILE): + cnf = apt_pkg.newConfiguration() + apt_pkg.ReadConfigFile(cnf, SYNAPTIC_CONF_FILE) + use_proxy = cnf.FindB("Synaptic::useProxy", False) + if use_proxy: + proxy_host = cnf.Find("Synaptic::httpProxy") + proxy_port = str(cnf.FindI("Synaptic::httpProxyPort")) + if proxy_host and proxy_port: + # FIXME: set the proxy for libapt here as well (e.g. for the + # DistUpgradeFetcher + proxy = "http://%s:%s/" % (proxy_host, proxy_port) + elif self.gconfclient.get_bool("/system/http_proxy/use_http_proxy"): host = self.gconfclient.get_string("/system/http_proxy/host") port = self.gconfclient.get_int("/system/http_proxy/port") use_auth = self.gconfclient.get_bool("/system/http_proxy/use_authentication") @@ -402,6 +397,10 @@ class UpdateManager(SimpleGladeApp): proxy = "http://%s:%s@%s:%s/" % (auth_user,auth_pass,host, port) else: proxy = "http://%s:%s/" % (host, port) + if proxy: + proxy_support = urllib2.ProxyHandler({"http":proxy}) + opener = urllib2.build_opener(proxy_support) + urllib2.install_opener(opener) os.putenv("http_proxy",proxy) def header_column_func(self, cell_layout, renderer, model, iter): diff --git a/debian/changelog b/debian/changelog index 4da39b63..1beb54ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ update-manager (0.44.16) edgy; urgency=low - * fix proxy use in user-mode + * fix proxy usage when runing in non-root mode (lp: #40626) -- Michael Vogt Fri, 6 Oct 2006 15:17:37 +0200 -- cgit v1.2.3 From ff9de68c6430ff296e0781a8cee1122e89785db5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Oct 2006 12:09:34 +0200 Subject: * UpdateManager/UpdateManager.py: - do not create a new "MyCache()" on each initCache() but use cache.open() instead. This fixes a memory leak (lp: 43096) --- UpdateManager/UpdateManager.py | 6 +- debian/changelog | 6 + po/am.po | 125 +++++++--- po/ar.po | 132 ++++++++--- po/be.po | 133 ++++++++--- po/bg.po | 238 ++++++++++++------- po/bn.po | 201 ++++++++++------ po/br.po | 123 ++++++++-- po/ca.po | 228 +++++++++++------- po/cs.po | 188 ++++++++++----- po/da.po | 163 +++++++++---- po/de.po | 285 ++++++++++++++--------- po/el.po | 190 ++++++++++----- po/en_AU.po | 245 ++++++++++++-------- po/en_CA.po | 205 +++++++++++------ po/en_GB.po | 191 +++++++++++----- po/eo.po | 125 +++++++--- po/es.po | 263 +++++++++++++-------- po/et.po | 129 ++++++++--- po/eu.po | 128 ++++++++--- po/fa.po | 129 ++++++++--- po/fi.po | 264 +++++++++++++-------- po/fr.po | 246 +++++++++++++------- po/fur.po | 123 ++++++++-- po/gl.po | 287 ++++++++++++++--------- po/he.po | 200 ++++++++++------ po/hi.po | 123 ++++++++-- po/hr.po | 187 ++++++++++----- po/hu.po | 179 ++++++++++----- po/id.po | 189 ++++++++++----- po/it.po | 294 +++++++++++++++--------- po/ja.po | 469 +++++++++++++++++++++++++------------- po/ka.po | 144 +++++++++--- po/ko.po | 308 +++++++++++++++++-------- po/ku.po | 152 ++++++++---- po/lt.po | 207 +++++++++++------ po/lv.po | 125 +++++++--- po/mk.po | 193 +++++++++++----- po/ms.po | 140 +++++++++--- po/nb.po | 252 ++++++++++++-------- po/ne.po | 245 ++++++++++++-------- po/nl.po | 205 +++++++++++------ po/nn.po | 129 ++++++++--- po/no.po | 2 +- po/oc.po | 136 ++++++++--- po/pa.po | 127 ++++++++--- po/pl.po | 361 +++++++++++++++++------------ po/pt.po | 192 +++++++++++----- po/pt_BR.po | 325 +++++++++++++++----------- po/qu.po | 125 +++++++--- po/ro.po | 184 ++++++++++----- po/ru.po | 161 +++++++++---- po/rw.po | 170 ++++++++++---- po/sk.po | 280 ++++++++++++++--------- po/sl.po | 133 ++++++++--- po/sq.po | 125 +++++++--- po/sr.po | 133 ++++++++--- po/sv.po | 507 +++++++++++++++++++++++------------------ po/ta.po | 125 +++++++--- po/th.po | 282 +++++++++++++---------- po/tr.po | 153 +++++++++---- po/uk.po | 195 ++++++++++------ po/update-manager.pot | 2 +- po/ur.po | 123 ++++++++-- po/urd.po | 2 +- po/vi.po | 179 ++++++++++----- po/xh.po | 127 ++++++++--- po/zh_CN.po | 209 ++++++++++++----- po/zh_HK.po | 193 +++++++++++----- po/zh_TW.po | 254 +++++++++++++-------- 70 files changed, 8824 insertions(+), 4075 deletions(-) (limited to 'debian') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index e659843a..af1a1b8e 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -891,7 +891,11 @@ class UpdateManager(SimpleGladeApp): self.progressbar_cache, self.label_cache, self.window_main) - self.cache = MyCache(progress) + if hasattr(self, "cache"): + self.cache.open(progress) + self.cache._initDepCache() + else: + self.cache = MyCache(progress) except AssertionError: # we assert a clean cache msg=("%s\n\n%s"% \ diff --git a/debian/changelog b/debian/changelog index 1beb54ae..721ed39b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.44.17) edgy; urgency=low + + * memory leak fixed (lp: #43096) + + -- + update-manager (0.44.16) edgy; urgency=low * fix proxy usage when runing in non-root mode (lp: #40626) diff --git a/po/am.po b/po/am.po index 9f034eba..7bb6aaf2 100644 --- a/po/am.po +++ b/po/am.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-06-11 10:15+0000\n" "Last-Translator: Habte \n" "Language-Team: Amharic \n" @@ -55,6 +55,7 @@ msgstr "ከአንድ ወር በሓላ" msgid "After %s days" msgstr "" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,8 +127,7 @@ msgstr "ቁለፉን የማጥፋት ሰህተት" #: ../SoftwareProperties/SoftwareProperties.py:993 #, fuzzy -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "የመረጡትን ቁለፍ ማጥፋት አይቻልም፣ እባክዎን ይህንን ሰህተት ያመለከቱ" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -162,6 +164,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -174,6 +177,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -196,6 +200,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -255,6 +260,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -311,6 +317,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -373,6 +380,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -383,6 +391,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -433,6 +442,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -460,6 +470,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -475,6 +486,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -498,13 +510,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -544,8 +557,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -591,6 +605,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -610,6 +625,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -715,6 +731,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -804,14 +821,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -824,106 +844,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1245,184 +1273,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/ar.po b/po/ar.po index a932a7d5..c38adbbd 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-08-05 12:39+0000\n" "Last-Translator: Saleh Odeh \n" "Language-Team: Arabic \n" @@ -55,6 +55,7 @@ msgstr "بعد شهر" msgid "After %s days" msgstr "بعد %s يوم" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,10 +124,8 @@ msgstr "خطاء في ازالة المفتاح" #: ../SoftwareProperties/SoftwareProperties.py:993 #, fuzzy -msgid "" -"The key you selected could not be removed. Please report this as a bug." -msgstr "" -"إلمفتاح الذي إخترتة لا يمكن إزالتة, الرجاء التبليغ عن هذا كخطأ برمجي." +msgid "The key you selected could not be removed. Please report this as a bug." +msgstr "إلمفتاح الذي إخترتة لا يمكن إزالتة, الرجاء التبليغ عن هذا كخطأ برمجي." #: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format @@ -164,6 +165,7 @@ msgstr "لا يمكن تحديث الرزم العليا المطلوبة" msgid "A essential package would have to be removed" msgstr "سيكون من الضروري إزالة رزم مهمة" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 #, fuzzy msgid "Could not calculate the upgrade" @@ -177,6 +179,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 #, fuzzy msgid "Error authenticating some packages" @@ -202,6 +205,7 @@ msgid "" msgstr "" "لم يكن بالإمكان تثبيت إحدى الرزم المطلوبة. الرجاء التبليغ عن هذا كخطأ برمجي. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -262,6 +266,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -321,6 +326,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "هل تريد البدء في عملية التحديث الان؟" @@ -390,6 +396,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -400,6 +407,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -451,8 +459,9 @@ msgstr "جاري عملية البحث عن البرامج الملغية" msgid "System upgrade is complete." msgstr "إنتهت عملية تحديث النظام." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 -#, fuzzy +#, fuzzy, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "الرجاء ادراج '%s' في السوّاقة '%s'" @@ -478,6 +487,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "جاري تطبيق التغييرات" @@ -493,6 +503,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -517,13 +528,14 @@ msgstr "وقع خطأ شديد" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -566,8 +578,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "لمنع فقدان المعلومات الرجاء إغلاق جميع البرامج و الوثائق المفتوحة." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 #, fuzzy msgid "Your system is up-to-date" msgstr "إن نظامك الآن محدث" @@ -579,7 +592,7 @@ msgid "" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:535 -#, fuzzy +#, fuzzy, python-format msgid "Remove %s" msgstr "إزالة %s " @@ -614,6 +627,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -635,6 +649,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -743,6 +758,7 @@ msgstr "لم يمكن تنزيل ملاحظات الإصدار" msgid "Please check your internet connection." msgstr "الرجاء التأكد من إتصالك بالإنترنت" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "لم يكن ممكنا تشغيل أداة التحديث" @@ -834,14 +850,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -854,33 +873,35 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "الإصدار %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 -#, fuzzy +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 +#, fuzzy, python-format msgid "Download size: %s" msgstr "حجم التنزيل: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -888,73 +909,79 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "الرجاء الإنتظار, قد يستغرق هذا وقتا" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "لقد انتهت عملية التحديث" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "فهرس البرامج تالف" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1284,187 +1311,232 @@ msgstr "مساحة النافذة" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "مدعوم بشكل رسمي" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "حقوق نقل محدودة" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #~ msgid " " -#~ msgstr " " \ No newline at end of file +#~ msgstr " " diff --git a/po/be.po b/po/be.po index ba7dd450..d53002d6 100644 --- a/po/be.po +++ b/po/be.po @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-07-06 06:10+0000\n" "Last-Translator: Alexander Nyakhaychyk \n" "Language-Team: Belarusian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" @@ -56,6 +56,7 @@ msgstr "Пасьля аднаго месяца" msgid "After %s days" msgstr "Пасьля %s дзён" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "Памылка выдаленьня ключа" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Выбраны ключ ня можа быць выдалены. Калі ласка, дашліце баг-рэпорт аб гэтым." @@ -163,6 +165,7 @@ msgstr "Немагчыма абнавіць неабходныя мэтапак msgid "A essential package would have to be removed" msgstr "Трэба было-б выдаліць абавязковы пакет" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Немагчыма падлічыць абнаўленьне" @@ -175,6 +178,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Памылка аўтэнтыфікацыі некаторых пакетаў" @@ -202,6 +206,7 @@ msgstr "" "Немагчыма ўсталяваць патрэбны пакет. Калі ласка, паведаміце аб гэтай " "памылцы. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Немагчыма вызначыць мэта-пакет" @@ -261,6 +266,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Стварыць прадвызначаны сьпіс крыніц?" @@ -273,8 +279,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Пасьля агляду вашага файла \"sources.list\" не былі знойдзены запісы для " -"\"%s\".\n" +"Пасьля агляду вашага файла \"sources.list\" не былі знойдзены запісы для \"%s" +"\".\n" "\n" "Ці мусяць быць дададзены прадвызначаныя запісы для \"%s\"? Калі вы вылучыце " "\"Не\", абнаўленьне будзе скасавана." @@ -329,6 +335,7 @@ msgstr "" "на %s. Спусташыце Сьметніцу й выдаліце часовыя пакеты былых усталёвак з " "дапамогай загаду \"sudo apt-get clean\"." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Ці жадаеце пачаць абнаўленьне?" @@ -395,6 +402,7 @@ msgstr "" "Узьніклі нейкія памылкі ў час ачысткі. Калі ласка, паглядзіце зьмешчанае " "ніжэй паведамленьне. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -405,6 +413,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -455,6 +464,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -482,6 +492,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Зьдзяйсьненьне зьменаў" @@ -497,6 +508,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -520,13 +532,14 @@ msgstr "Узьнікла невыправімая памылка" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -569,8 +582,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -616,6 +630,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -637,6 +652,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -746,6 +762,7 @@ msgstr "Немагчыма зпампаваць нататкі рэдакцыі" msgid "Please check your internet connection." msgstr "Калі ласка, праверце вашае далучэньне да інтэрнэту." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Немагчыма запусьціць сродак абнаўленьня" @@ -837,14 +854,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -857,33 +877,35 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Вэрсія %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -891,73 +913,79 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Абнаўленьне завершана" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Ваш дыстрыбутыў больш не падтрымліваецца" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Маецца ў наяўнасьці новая рэдакцыя \"%s\" дыстрыбутыву" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Пашкоджаны індэкс праграм" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1279,184 +1307,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/bg.po b/po/bg.po index 2cc30edc..d630f54b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:41+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" @@ -55,6 +55,7 @@ msgstr "След един месец" msgid "After %s days" msgstr "След %s дни" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -123,14 +126,13 @@ msgid "Error removing the key" msgstr "Грешка при премахване на ключа" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключът, който избрахте не може да бъде премахнат. Докладвайте това като " "грешка." #: ../SoftwareProperties/SoftwareProperties.py:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -169,6 +171,7 @@ msgstr "Не може да бъдат надградени изисквани м msgid "A essential package would have to be removed" msgstr "Ще трябва да бъде премахнат важен пакет" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Не може да бъде планирано надграждането" @@ -184,6 +187,7 @@ msgstr "" "Възникна непреодолим проблем при планиране на надграждането. Докладвайте " "това като грешка." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Грешка при удостоверяването автентичността на някои пакети" @@ -211,6 +215,7 @@ msgstr "" "Не можеше да бъде инсталиран нужен пакет. Моля, докладвайте това като " "грешка! " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Не могат да бъдат предположени мета-пакети" @@ -283,6 +288,7 @@ msgstr "" "изберете \"Да\", всички записи \"%s \" ще бъдат актуализирани на \"%s\".\n" "Ако изберете \"Не\", актуализирането ще бъде отменено." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Генериране на източници по подразбиране?" @@ -295,8 +301,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"След преглеждане на Вашия \"sources.list\" не бе открит валиден запис за " -"\"%s\".\n" +"След преглеждане на Вашия \"sources.list\" не бе открит валиден запис за \"%s" +"\".\n" "\n" "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", " "актуализацията ще бъде отменена." @@ -352,6 +358,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Желаете ли да започне надграждането?" @@ -421,6 +428,7 @@ msgstr "" "Имаше проблем при почистването. Моля, вижте съобщението по-долу за повече " "информация! " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Рестартиране на системата" @@ -431,6 +439,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -461,7 +470,7 @@ msgid "Invalid package information" msgstr "Невалидна информация за пакет" #: ../DistUpgrade/DistUpgradeControler.py:721 -#, fuzzy +#, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore.\n" @@ -489,6 +498,7 @@ msgstr "Търсене на остарял софтуер" msgid "System upgrade is complete." msgstr "Надграждането на системата завърши." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -500,7 +510,7 @@ msgid "Fetching is complete" msgstr "Актуализацията е завършена" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Сваляне на файл %li от %li при %s/сек" @@ -511,12 +521,13 @@ msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Изтегляне на файл %li от общо %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Прилагане на промените" @@ -532,8 +543,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -558,41 +570,42 @@ msgstr "Възникна фатална грешка" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Моля, съобщете това като грешка и включете файловете \"/var/log/dist-" -"upgrade.log\" и \"/var/log/dist-upgrade-apt.log\" във Вашия доклад. " -"Надграждането сега ще бъде прекратено.\n" -"Оригиналният \"sources.list\" was saved inбе съхранен в " -"\"/etc/apt/sources.list.distUpgrade\"." +"Моля, съобщете това като грешка и включете файловете \"/var/log/dist-upgrade." +"log\" и \"/var/log/dist-upgrade-apt.log\" във Вашия доклад. Надграждането " +"сега ще бъде прекратено.\n" +"Оригиналният \"sources.list\" was saved inбе съхранен в \"/etc/apt/sources." +"list.distUpgrade\"." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Пакетът %s ще бъде премахнат." msgstr[1] "Пакетите %s ще бъдат премахнати." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s нов пакет ще бъде инсталиран." msgstr[1] "%s нови пакети ще бъдат инталирани." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s пакет ще бъде надграден." msgstr[1] "%s нови пакети ще бъдат надградени." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -617,8 +630,9 @@ msgstr "" "За да предодвратите загуба на данни, затворете всички отворени приложения и " "документи." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Системата Ви е актуална" @@ -664,6 +678,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -683,6 +698,7 @@ msgstr "Надграждането е завършено и има нужда о #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -796,6 +812,7 @@ msgstr "Не можеше да бъдат свалени бележките къ msgid "Please check your internet connection." msgstr "Моля, проверете Интернет връзката си!" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Не може да бъде стартирана помощната програма за надграждане." @@ -872,12 +889,12 @@ msgstr "" "мрежата или сървъра. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Сваляне на файл %li от %li при %s/сек" #: ../UpdateManager/GtkProgress.py:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Сваляне на файл %li от %li при %s/сек" @@ -902,15 +919,18 @@ msgstr "" "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет " "връзката си." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 актуализации на сигурността" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -926,75 +946,78 @@ msgstr "Ubuntu 5.10 Състарени версии" msgid "Distribution updates" msgstr "_Поднови надграждането" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "_Инсталиране на актуализациите" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Сваляне на списъка с промени..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Проверка" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Размер за изтегляне: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Можете да инсталирате %s актуализация" msgstr[1] "Можете да инсталирате %s актуализации" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Моля, изчакайте! Това може да отнеме известно време." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Актуализацията е завършена" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "_Инсталиране на актуализациите" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Нова версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Версия %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуция вече не се поддържа" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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,16 +1027,17 @@ msgstr "" "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com " "за повече информация за надграждането!" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Индексът на софтуера е повреден" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1023,19 +1047,23 @@ 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" @@ -1311,8 +1339,8 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Добавете пълния APT ред за канала, който искате да " -"добавите\n" +"Добавете пълния APT ред за канала, който искате да добавите\n" "\n" "APT редът съдържа вида, местонахождението и компонентите за даден канал. " "Например „deb http://ftp.debian.org sarge main“." @@ -1408,206 +1436,250 @@ msgstr "Размерът на прозореца" msgid "Configure the sources for installable software and updates" msgstr "Настройка на софтуерните канали и актуализациите по Интернет" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 актуализации" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Поддържани от обществото (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Допринесен софтуер" +#. Description #: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Поддържани от обществото (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Поддържани от обществото (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Поддържани от обществото (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Несвободни (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Несвободни (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 актуализации на сигурността" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 актуализации" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Състарени версии" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официално поддържани" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 актуализации на сигурността" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 актуализации" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Състарени версии" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Поддържани от обществото (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Несвободни (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Официално поддържан" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Ограничени авторски права" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 обновления по сигурността" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 обновления" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Състарени версии" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 „Sarge“" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" актуализации на сигурността" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (тестване)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (нестабилен)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-съвместим софтуер с несвободни зависимости" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Софтуер несъвместим с DFSG" @@ -1616,7 +1688,6 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "Ограничен за изнасяне от САЩ софтуер" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Сваляне на файл %li от %li при неизвестна скорост" @@ -1637,7 +1708,8 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Надграждане до Ubuntu 6.06 LTS" +#~ "Надграждане до Ubuntu 6.06 LTS" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1667,13 +1739,13 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Някои актуализации изискват премахването на допълнителен софтуер. " #~ "Използвайте функцията „Маркиране на всички актуализации” на Диспечера на " -#~ "пакети „Synaptic” или задействайте „sudo apt-get dist-upgrade” в терминален " -#~ "прозорец, за да актуализирате напълно системата си." +#~ "пакети „Synaptic” или задействайте „sudo apt-get dist-upgrade” в " +#~ "терминален прозорец, за да актуализирате напълно системата си." #~ msgid "The following updates will be skipped:" #~ msgstr "Следните актуализации ще бъдат пропуснати:" @@ -1694,7 +1766,8 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgstr "Покажи детайлите" #~ msgid "Only one software management tool is allowed to run at the same time" -#~ msgstr "Позволено е да оперира само един диспечер на софтуера в даден момент" +#~ msgstr "" +#~ "Позволено е да оперира само един диспечер на софтуера в даден момент" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." @@ -1802,16 +1875,16 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgstr "" #~ "Ключове за идентификация\n" #~ "\n" -#~ "Може да добавяте и премахвате ключове за идентификация през този прозорец. " -#~ "Ключът прави възможна проверката на цялостта на софтуера, който сваляте от " -#~ "интернет." +#~ "Може да добавяте и премахвате ключове за идентификация през този " +#~ "прозорец. Ключът прави възможна проверката на цялостта на софтуера, който " +#~ "сваляте от интернет." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Добавяне на нов ключов файл за доверените вериги от ключове. Уверете се, че " -#~ "сте получили ключа по сигурен канал и че можете да се доверите на " +#~ "Добавяне на нов ключов файл за доверените вериги от ключове. Уверете се, " +#~ "че сте получили ключа по сигурен канал и че можете да се доверите на " #~ "собственика. " #~ msgid "Add repository..." @@ -1839,8 +1912,8 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgstr "Максимален размер в Мб:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Възвръщане на стандартните ключове идващи с дистрибуцията. Това няма да " #~ "промени потребителските инсталирани ключове." @@ -1872,13 +1945,13 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Налични обновления\n" #~ "\n" -#~ "Следните пакети могат да бъдат обновени. Може да ги обновите като натиснете " -#~ "бутона „Инсталиране“." +#~ "Следните пакети могат да бъдат обновени. Може да ги обновите като " +#~ "натиснете бутона „Инсталиране“." #~ msgid "Cancel downloading the changelog" #~ msgstr "Отказ на свалянето на дневника на промените" @@ -1954,7 +2027,8 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgstr[1] "Избрахте всички %s пакета за обновяване, с общ размер %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Избрахте %s от %s пакет за обновяване, с размер %s" #~ msgstr[1] "Избрахте %s от %s пакета за обновяване, с общ размер %s" @@ -1962,11 +2036,11 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgstr "Обновленията се прилагат." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Може да стартирате само една програма за управление на пакетите. Затворете " -#~ "другата програма първо." +#~ "Може да стартирате само една програма за управление на пакетите. " +#~ "Затворете другата програма първо." #~ msgid "Updating package list..." #~ msgstr "Обновяване на списъка с пакетите..." @@ -1979,25 +2053,25 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Обновете до новата версия на Ubuntu Linux. За версията, която имате ще бъдат " -#~ "спрени поправките по сигурността и други критични обновления. Вижте " +#~ "Обновете до новата версия на Ubuntu Linux. За версията, която имате ще " +#~ "бъдат спрени поправките по сигурността и други критични обновления. Вижте " #~ "http://www.ubuntulinux.org за повече информация." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Има нова версия на Ubuntu!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Излезнала е нова версия с кодовото име „%s“. Вижте " -#~ "http://www.ubuntulinux.org за информация по обновяването." +#~ "Излезнала е нова версия с кодовото име „%s“. Вижте http://www.ubuntulinux." +#~ "org за информация по обновяването." #~ msgid "Never show this message again" #~ msgstr "Без да се показва това съобщение отново" #~ msgid "Changes not found, the server may not be updated yet." -#~ msgstr "Няма открити промени. Сървърът може би не е обновен." \ No newline at end of file +#~ msgstr "Няма открити промени. Сървърът може би не е обновен." diff --git a/po/bn.po b/po/bn.po index d9b5c84e..e2eec2cf 100644 --- a/po/bn.po +++ b/po/bn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:37+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" @@ -55,6 +55,7 @@ msgstr "এক মাস পর" msgid "After %s days" msgstr "%s দিন পর" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,12 +124,11 @@ msgid "Error removing the key" msgstr "কী সরাতে সমস্যা হয়েছে" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -162,6 +164,7 @@ msgstr "দরকারী meta-packages আপগ্রেড করতে প msgid "A essential package would have to be removed" msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "আপগ্রেড গণনা করতে পারছে না" @@ -174,6 +177,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -195,9 +199,10 @@ msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" -"একটি প্রয়োজনীয় প্যাকেজ ইন্সটল করা অসম্ভব ছিল। অনুগ্রহ করে একে একটি বাগ " -"হিসাবে রিপোর্ট করুন। " +"একটি প্রয়োজনীয় প্যাকেজ ইন্সটল করা অসম্ভব ছিল। অনুগ্রহ করে একে একটি বাগ হিসাবে " +"রিপোর্ট করুন। " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "meta-package অনুমান করা যাচ্ছ না" @@ -258,6 +263,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "ডিফল্ট sources তৈরি করে?" @@ -270,11 +276,11 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"আপনার 'sources.list' স্ক্যান করার পর '%s' এর জন্য কোন সঠিক এন্ট্রি খুজে " -"পাওয়া যায় নি।\n" +"আপনার 'sources.list' স্ক্যান করার পর '%s' এর জন্য কোন সঠিক এন্ট্রি খুজে পাওয়া যায় " +"নি।\n" "\n" -"'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট " -"বাতিল হবে।" +"'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট বাতিল " +"হবে।" #: ../DistUpgrade/DistUpgradeControler.py:301 msgid "Repository information invalid" @@ -285,8 +291,8 @@ msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -"রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে " -"বাগ হিসাবে রিপোর্ট করুন।" +"রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ " +"হিসাবে রিপোর্ট করুন।" #: ../DistUpgrade/DistUpgradeControler.py:308 msgid "Third party sources disabled" @@ -308,8 +314,8 @@ 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:368 msgid "Not enough free disk space" @@ -323,6 +329,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "আপনি কি আপগ্রেড শুরু করতে চান?" @@ -349,8 +356,8 @@ msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -"আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া " -"পরীক্ষা করুন এবং আবার চেষ্টা করুন। " +"আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া পরীক্ষা " +"করুন এবং আবার চেষ্টা করুন। " #: ../DistUpgrade/DistUpgradeControler.py:516 msgid "Support for some applications ended" @@ -387,6 +394,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "সিস্টেমটি রিস্টার্ট করছি" @@ -397,6 +405,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -448,6 +457,7 @@ msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন msgid "System upgrade is complete." msgstr "সিস্টেম আপগ্রেড সম্পন্ন।" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -459,23 +469,24 @@ msgid "Fetching is complete" msgstr "আপডেট সম্পন্ন" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "%li of %li ফাইল ডাউনলোড করছে" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "%li মিিনিট বাকি আছে" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "%li of %li ফাইল ডাউনলোড করছে" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "পরিবর্তনগুলো প্রয়োগ করছি" @@ -491,8 +502,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -516,36 +528,37 @@ msgstr "একটি মারাত্মক সমস্যা সংঘটি #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%s টি প্যাকেজ মোছা হবে।" msgstr[1] "%s টি প্যাকেজ মোছা হবে।" #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -560,15 +573,15 @@ msgstr "" msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." -msgstr "" -"আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।" +msgstr "আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।" #: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "আপনার সিস্টেম আপ-টু-ডেট" @@ -594,12 +607,12 @@ msgid "Upgrade %s" msgstr "%s আপগ্রেড" #: ../DistUpgrade/DistUpgradeView.py:27 -#, fuzzy +#, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "%li দিন %li ঘন্টা %li মিিনিট বাকি আছে" #: ../DistUpgrade/DistUpgradeView.py:29 -#, fuzzy +#, fuzzy, python-format msgid "%li hours %li minutes" msgstr "%li ঘন্টা %li মিিনিট বাকি আছে" @@ -614,6 +627,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -628,12 +642,12 @@ msgstr "রিবুট করা প্রয়োজন" #: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" -msgstr "" -"আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?" +msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -742,6 +756,7 @@ msgstr "রিলিজ নোট ডাউনলোড করা যায় ন msgid "Please check your internet connection." msgstr "অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "আপগ্রেড টুলটি চালানো যায় নি" @@ -783,9 +798,7 @@ msgstr "এক্সট্রাক্ট করতে ব্যর্থ" msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " -msgstr "" -"আপগ্রেডটি এক্সট্রাক্ট করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা থাকতে " -"পারে। " +msgstr "আপগ্রেডটি এক্সট্রাক্ট করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা থাকতে পারে। " #: ../UpdateManager/DistUpgradeFetcher.py:221 msgid "Verfication failed" @@ -797,8 +810,8 @@ msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -"আপগ্রেড যথার্থ্য হয়েছে কিনা তা পরীক্ষা করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে " -"সমস্যা থাকতে পারে। " +"আপগ্রেড যথার্থ্য হয়েছে কিনা তা পরীক্ষা করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা " +"থাকতে পারে। " #: ../UpdateManager/DistUpgradeFetcher.py:228 msgid "Authentication failed" @@ -838,18 +851,20 @@ msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -"পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ " -"পরীক্ষা করুন।" +"পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -865,110 +880,118 @@ msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" msgid "Distribution updates" msgstr "পুনরায় আপগ্রেড শুরু (_R)" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "ভার্সন %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "পরীক্ষা করো (_C)" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "ডাউনলোড এর আকার: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন" msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "আপডেট সম্পন্ন" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "নতুন ভার্সন: %s (আকার: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "ভার্সন %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1306,201 +1329,245 @@ msgstr "উইনডোর আকার" msgid "Configure the sources for installable software and updates" msgstr "সফ্টওয়্যার চ্যানেল এবং ইন্টারনেট আপডেট কনফিগার" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "উবুন্টু ৫.১০ আপডেট" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "ফ্রি নয় (মাল্টিভার্স)" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "ফ্রি নয় (মাল্টিভার্স)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "অফিসিয়াল ভাবে সমর্থিত" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "ডেবিয়ান ৩.১ \"সার্জ\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "ডেবিয়ান ৩.১ \"Sarge\" নিরাপত্তামুলক আপডেট" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "ডেবিয়ান \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "ডেবিয়ান \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1546,7 +1613,6 @@ msgstr "" #~ msgid "The following updates will be skipped:" #~ msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "%li সেকেন্ড বাকি আছে" @@ -1554,8 +1620,7 @@ msgstr "" #~ msgstr "ডাউনলোড সম্পন্ন" #~ msgid "The upgrade aborts now. Please report this bug." -#~ msgstr "" -#~ "আপগ্রেডটি নিস্ফল ভাবে বের হয়ে যাচ্ছ। অনুগ্রহ করে এই বাগটি রিপোর্ট করুন।" +#~ msgstr "আপগ্রেডটি নিস্ফল ভাবে বের হয়ে যাচ্ছ। অনুগ্রহ করে এই বাগটি রিপোর্ট করুন।" #~ msgid "Upgrading Ubuntu" #~ msgstr "উবুন্টু আপগ্রেড করছি" @@ -1572,8 +1637,8 @@ msgstr "" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." #~ msgstr "" -#~ "অনুগ্রহ করে অন্যান্য অ্যাপলিকেশন যেমন, 'aptitude' অথবা 'Synaptic' প্রথমে " -#~ "বন্ধ করুন।" +#~ "অনুগ্রহ করে অন্যান্য অ্যাপলিকেশন যেমন, 'aptitude' অথবা 'Synaptic' প্রথমে বন্ধ " +#~ "করুন।" #~ msgid "Channels" #~ msgstr "চ্যানেল" @@ -1620,4 +1685,4 @@ msgstr "" #~ msgstr "উবুন্টু ৬.০৬ আপডেট" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "উবুন্টু ৬.০৬ ব্যাকপোর্ট" \ No newline at end of file +#~ msgstr "উবুন্টু ৬.০৬ ব্যাকপোর্ট" diff --git a/po/br.po b/po/br.po index 2bb246dc..cda3200d 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" @@ -55,6 +55,7 @@ msgstr "" msgid "After %s days" msgstr "War-lerc'h %s devezh" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,8 +125,7 @@ msgid "Error removing the key" msgstr "Fazi en ur zilemel an alc'hwezh" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -162,6 +164,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -174,6 +177,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -196,6 +200,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -255,6 +260,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -311,6 +317,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -373,6 +380,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -383,6 +391,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -433,6 +442,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -460,6 +470,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -475,6 +486,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -498,13 +510,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -544,8 +557,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -591,6 +605,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -610,6 +625,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -715,6 +731,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -804,14 +821,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -824,106 +844,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1246,187 +1274,232 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #~ msgid " " -#~ msgstr " " \ No newline at end of file +#~ msgstr " " diff --git a/po/ca.po b/po/ca.po index d79e8ab3..0ce2d339 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:41+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" @@ -54,6 +54,7 @@ msgstr "Després d'un mes" msgid "After %s days" msgstr "Després de %s dies" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "" msgid "Main server" msgstr "Servidor principal" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,14 +127,13 @@ msgid "Error removing the key" msgstr "S'ha produït un error en esborrar la clau" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -170,6 +172,7 @@ msgstr "No s'han pogut actualitzar els metapaquets sol·licitats" 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:220 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" @@ -185,6 +188,7 @@ msgstr "" "S'ha produït un problema greu alhora de calcular l'actualització. Informeu " "de l'error." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" @@ -212,6 +216,7 @@ msgstr "" "No s'ha pogut instal·lar un dels paquets sol·licitats. Envieu un informe amb " "els error. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -278,6 +283,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Voleu generar les fonts per defecte?" @@ -341,11 +347,12 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"L'actualització s'ha cancel·lat. Allibereu almenys %s d'espai de disc a " -"%s. \n" +"L'actualització s'ha cancel·lat. Allibereu almenys %s d'espai de disc a %s." +"\r\n" "Buideu la vostra paperera i esborreu els paquets temporals utilitzant 'sudo " "apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Voleu iniciar l'actualització?" @@ -418,6 +425,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "S'està restaurant l'estat original del sistema" @@ -428,6 +436,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -482,6 +491,7 @@ msgstr "S'està cercant programari obsolet" msgid "System upgrade is complete." msgstr "S'ha completat l'actualització del sistema" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -493,23 +503,24 @@ msgid "Fetching is complete" msgstr "S'ha completat l'actualització" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "S'està descarregant el fitxer %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "Queden uns %li minuts" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "S'està descarregant el fitxer %li de %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "S'estan aplicant els canvis" @@ -525,8 +536,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -550,36 +562,37 @@ msgstr "S'ha produït un error greu" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "S'esborrarà %s paquet" msgstr[1] "S'esborraran %s paquets" #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "S'instal·larà %s paquet" msgstr[1] "S'instal·laran %s paquets" #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "S'actualitzarà %s paquet" msgstr[1] "S'actualitzaran %s paquets" #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -604,8 +617,9 @@ msgstr "" "Per a evitar una possible pèrdua de dades, tanqueu tos els documents i " "aplicacions." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "El vostre sistema està actualitzat" @@ -631,12 +645,12 @@ msgid "Upgrade %s" msgstr "Actualitza %s" #: ../DistUpgrade/DistUpgradeView.py:27 -#, fuzzy +#, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Queden uns %li dies %li hores %li minuts" #: ../DistUpgrade/DistUpgradeView.py:29 -#, fuzzy +#, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Queden unes %li hores %li minuts" @@ -651,6 +665,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -672,6 +687,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -691,8 +707,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" -msgstr "" -"Reinicieu el sistema per a completar l'actualització" +msgstr "Reinicieu el sistema per a completar l'actualització" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -785,6 +800,7 @@ msgstr "No s'han pogut descarregar les notes de la versió" msgid "Please check your internet connection." msgstr "Comproveu la vostra connexió a Internet" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "No es pot executar l'eina d'actualització" @@ -850,12 +866,12 @@ msgid "" msgstr "" #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "S'està descarregant el fitxer %li de %li amb %s/s" @@ -880,15 +896,18 @@ msgstr "" "S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió " "a Internet." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Debian Stable Security Updates" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -904,75 +923,78 @@ msgstr "Actualitzacions d'Ubuntu 6.06 LTS" msgid "Distribution updates" msgstr "_Reprén l'actualització" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "_Instal·la les actualitzacions" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versió %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Comprova" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Mida de la descàrrega: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Espereu, això pot tardar una estona." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "S'estan comprovant les actualitzacions..." -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Versió nova: %s (Mida: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Versió %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "La vostra distribució ja no es mantindrà més" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -982,16 +1004,17 @@ msgstr "" "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més " "informació." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Ja disposeu de la nova distribució '%s'" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "L'índex de programari s'ha trencat" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1001,19 +1024,23 @@ 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" @@ -1377,207 +1404,251 @@ msgstr "La mida de la finestra" msgid "Configure the sources for installable software and updates" msgstr "Configura els canals de programari i les actualitzacions d'Internet" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualitzacions d'Ubuntu 5.10" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Paquets mantinguts per la comunitat (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Programari de la comunitat" +#. Description #: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Paquets mantinguts per la comunitat (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Paquets mantinguts per la comunitat (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Paquets sense llicència lliure (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualitzacions d'Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Paquets mantinguts oficialment (Main)" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Actualitzacions d'Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Algun programari ja no es mantindrà oficialment" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Paquets amb restriccions per copyright (Restricted)" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Actualitzacions d'Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualitzacions de seguretat de Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Programari compatible DFSG amb dependències no lliures" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Programari no compatible DFSG" @@ -1586,9 +1657,9 @@ msgstr "Programari no compatible DFSG" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "Programari amb restriccions d'exportació als EUA" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" -#~ msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda" +#~ msgstr "" +#~ "S'està descarregant el fitxer %li de %li a una velocitat desconeguda" #, fuzzy #~ msgid "Normal updates" @@ -1641,8 +1712,8 @@ msgstr "Programari no compatible DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Algunes actualitzacions requereixen la desinstal·lació de programari " #~ "adicional. Per actualitzar completament el vostre sistema utilitzeu la " @@ -1652,7 +1723,6 @@ msgstr "Programari no compatible DFSG" #~ msgid "The following updates will be skipped:" #~ msgstr "Les següents actualitzacions s'ometran:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Queden uns %li segons" @@ -1763,8 +1833,9 @@ msgstr "Programari no compatible DFSG" #~ msgstr "" #~ "Claus d'autenticació\n" #~ "\n" -#~ "Des d'aquest quadre de diàleg podeu afegir i esborrar claus d'autenticació. " -#~ "Les claus permeten comprovar la integritat del programari que descarregueu." +#~ "Des d'aquest quadre de diàleg podeu afegir i esborrar claus " +#~ "d'autenticació. Les claus permeten comprovar la integritat del programari " +#~ "que descarregueu." #~ msgid "" #~ "Enter the complete APT line of the repository that you want to " @@ -1777,15 +1848,15 @@ msgstr "Programari no compatible DFSG" #~ "Introduïu la línia APT del dipòsit que voleu afegir\n" #~ "\n" #~ "La línia APT conté el tipus, la ubicació i el contingut del dipòsit; per " -#~ "exemple, \"deb http://ftp.debian.org sarge main\". Podeu trobar una " -#~ "descripció més detallada de la sintaxi en la documentació." +#~ "exemple, \"deb http://ftp.debian.org sarge main\". Podeu trobar " +#~ "una descripció més detallada de la sintaxi en la documentació." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner." +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner." #~ msgstr "" -#~ "Afegeix una clau nova a l'anell de confiança. Assegureu-vos que heu rebut la " -#~ "clau per un canal segur i que confieu en el propietari." +#~ "Afegeix una clau nova a l'anell de confiança. Assegureu-vos que heu rebut " +#~ "la clau per un canal segur i que confieu en el propietari." #~ msgid "Add repository..." #~ msgstr "Afegeix un dipòsit..." @@ -1818,11 +1889,11 @@ msgstr "Programari no compatible DFSG" #~ msgstr "Restaura les claus per defecte" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Restaura les claus per defecte de la distribució. Això no afecta les claus " -#~ "instal·lades per l'usuari." +#~ "Restaura les claus per defecte de la distribució. Això no afecta les " +#~ "claus instal·lades per l'usuari." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Fixa la mida _màxima de memòria cau per als paquets descarregats" @@ -1854,8 +1925,8 @@ msgstr "Programari no compatible DFSG" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Actualitzacions disponibles\n" #~ "\n" @@ -1867,8 +1938,8 @@ msgstr "Programari no compatible DFSG" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "S'estan descarregant els " -#~ "canvis\n" +#~ "S'estan descarregant els canvis\n" #~ "\n" #~ "Es necessita obtenir els canvis des del servidor central" @@ -1957,7 +2028,8 @@ msgstr "Programari no compatible DFSG" #~ "Heu seleccionat els %s paquets actualitzats, la mida total és de %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Heu seleccionat %s paquet actualitzat de %s, la mida és de $s" #~ msgstr[1] "" #~ "Heu seleccionat %s paquets actualitzats de %s, la mida total és de %s" @@ -1972,8 +2044,8 @@ msgstr "Programari no compatible DFSG" #~ msgstr "S'està executant un altre gestor de paquets" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Només podeu executar un gestor de paquets a la vegada. Tanqueu l'altra " #~ "aplicació." @@ -1995,24 +2067,24 @@ msgstr "Programari no compatible DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Actualitzeu el sistema amb una versió més nova d'Ubuntu Linux. La vostra " #~ "versió ja no disposarà de més actualitzacions de seguretat ni d'altres " -#~ "actualitzacions crítiques. Si voleu més informació, visiteu " -#~ "http://www.ubuntulinux.org/." +#~ "actualitzacions crítiques. Si voleu més informació, visiteu http://www." +#~ "ubuntulinux.org/." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Ja disposeu del nou llançament d'Ubuntu" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Ja disposeu del nou llançament d'Ubuntu amb el nom en clau '%s'. Si " -#~ "necessiteu instruccions per a actualitzar el sistema, visiteu " -#~ "http://www.ubuntulinux.org/." +#~ "necessiteu instruccions per a actualitzar el sistema, visiteu http://www." +#~ "ubuntulinux.org/." #~ msgid "Never show this message again" #~ msgstr "No tornis a mostrar aquest missatge" @@ -2020,4 +2092,4 @@ msgstr "Programari no compatible DFSG" #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" #~ "No s'han trobat els canvis. Pot ser que el servidor encara no s'hagi " -#~ "actualitzat." \ No newline at end of file +#~ "actualitzat." diff --git a/po/cs.po b/po/cs.po index a794a893..43bb25e7 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:41+0000\n" "Last-Translator: Tomáš Hála \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" @@ -56,6 +56,7 @@ msgstr "Po měsíci" msgid "After %s days" msgstr "Po %s dnech" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "%s aktualizace" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Hlavní server" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,12 +125,11 @@ msgid "Error removing the key" msgstr "Chyba při odstraňování klíče" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -166,6 +168,7 @@ msgstr "Nemohu aktualizovat požadované meta-balíky" 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:220 msgid "Could not calculate the upgrade" msgstr "Nemohu vypočítat aktualizaci" @@ -184,6 +187,7 @@ msgstr "" "Prosím oznamte tuto chybu jako problém balíčku 'update-manager' a přiložte " "soubory v adresáři /var/log/dist-upgrade/ k vašemu chybovému hlášení." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Chyba při ověření některých balíků" @@ -210,6 +214,7 @@ msgid "" msgstr "" "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nemohu odhadnout meta-balík" @@ -292,6 +297,7 @@ msgstr "" "všechny položky '%s' aktualizovány na '%s'.\n" "Zvolíte-li 'Ne', aktualizace bude zrušena." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Vytvořit standardní zdroje?" @@ -363,6 +369,7 @@ msgstr "" "Vyprázdněte váš koš a odstraňte dočasné balíčky z dřívějších instalací " "pomocí 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Chcete spustit aktualizaci?" @@ -441,6 +448,7 @@ msgstr "" "Během čištění nastal nějaký problém. Pro více informací si prosím " "prohléhněte níže uvedenou zprávu. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Obnovuje se původní stav systému" @@ -451,6 +459,7 @@ msgid "Fetching backport of '%s'" msgstr "Stahuji backport '%s'" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -491,8 +500,8 @@ msgstr "" "Poté co byly aktualizovány informaco o balíčcích, nebyl nalezen nezbytný " "balík '%s'.\n" "Toto ukazuje na závažný problém, prosím nahlašte toto jako chybu balíku " -"'update-manager' a přiložte k hlášení o chybě soubory v adresáři " -"/var/log/dist-upgrade/." +"'update-manager' a přiložte k hlášení o chybě soubory v adresáři /var/log/" +"dist-upgrade/." #: ../DistUpgrade/DistUpgradeControler.py:733 msgid "Asking for confirmation" @@ -510,6 +519,7 @@ msgstr "Vyhledáván zastaralý software" msgid "System upgrade is complete." msgstr "Upgrade systému je dokončen." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -521,23 +531,24 @@ msgid "Fetching is complete" msgstr "Aktualizace je dokončena" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Stahuji soubor %li z %li rychlostí %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "Zhruba %li minut zbývá" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Stahuji soubor %li z %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Provádím změny" @@ -553,11 +564,12 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" "Aktualizace se přerušila. Nahlašte prosím tuto chybu jako chybu balíku " -"'update-manager' a přiložte k chybovému hlášení soubory z adresáře " -"/var/log/dist-upgrade/." +"'update-manager' a přiložte k chybovému hlášení soubory z adresáře /var/log/" +"dist-upgrade/." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -582,19 +594,20 @@ msgstr "Nastala fatální chyba" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Prosím oznamte toto jako chybu a do zprávy připojte soubory /var/log/dist-" "upgrade.log a /var/log/dist-upgrade-apt.log. Přechod na novou verzi bbude " -"nyní předčasně ukončen. Váš původní sources.list byl uložen do " -"/etc/apt/sources.list.distUpgrade." +"nyní předčasně ukončen. Váš původní sources.list byl uložen do /etc/apt/" +"sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%s balík bude odstraněn." @@ -602,7 +615,7 @@ msgstr[1] "%s balíky budou odstraněny." msgstr[2] "%s balíků bude odstraněno." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nový balík bude nainstalován." @@ -610,7 +623,7 @@ msgstr[1] "%s nové balíky budou nainstalovány." msgstr[2] "%s nových balíků bude nainstalováno." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s balík bude nahrazen vyšší verzí." @@ -618,7 +631,7 @@ msgstr[1] "%s balíky budou nahrazeny vyšší verzí." msgstr[2] "%s balíky bude nahrazeno vyšší verzí." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -639,8 +652,9 @@ msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen." msgid "To prevent data loss close all open applications and documents." msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Váš systém je aktuální" @@ -668,12 +682,12 @@ msgid "Upgrade %s" msgstr "Aktualizovat %s" #: ../DistUpgrade/DistUpgradeView.py:27 -#, fuzzy +#, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Zhruba %li hodin %li minut zbývá" #: ../DistUpgrade/DistUpgradeView.py:29 -#, fuzzy +#, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Zbývá zhruba %li hodin %li minut" @@ -688,6 +702,7 @@ msgid "%li seconds" msgstr "%li sekund" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -709,6 +724,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -821,6 +837,7 @@ msgstr "Nelze stáhnout poznámky k vydání." msgid "Please check your internet connection." msgstr "Prosím zkontrolujte své internetové připojení." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Nemohu spustit aktualizační nástroj" @@ -896,12 +913,12 @@ msgstr "" "Autentizace aktualizace selhala. Může být problém se sítí nebo serverem. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Stahuji %li. soubor z %li rychlostí %s/s" @@ -924,14 +941,17 @@ msgid "" msgstr "" "Selhalo stažení seznamu změn. Prosím zkontrolujte své internetové připojení." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Důležité bezpečnostní aktualizace" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Doporučené aktualizace" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -947,35 +967,37 @@ msgstr "Ubuntu 5.10 Backports" msgid "Distribution updates" msgstr "_Pokračovat v upgradu" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Ostatní aktualizace" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Verze %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Stahuji seznam změn ..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Zkontrolovat" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Stahovaná velikost: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -983,39 +1005,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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Prosím čekejte, může to nějakou dobu trvat." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Aktualizace je dokončena" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Zkontrolovat dostupné aktualizace" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Nová verze: %s (Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Verze %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Vaše distribude už není podporovaná" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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,16 +1048,17 @@ msgstr "" "Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na " "vyšší verzi se podívejte na http://www.ubuntu.com." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Nové vydání distribuce '%s' je k dispozici" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Seznam softwaru je poškozen" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1068,23 @@ msgstr "" "správce balíčků \"Synaptic\" nebo nejdříve spusťe v terminálu \"sudo apt-get " "install -f\" pro opravu tohoto problému." +#. 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 "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1331,8 +1359,8 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Zadejte úplný řádek pro cestu APT kanálu, který chcete " -"přidat\n" +"Zadejte úplný řádek pro cestu APT kanálu, který chcete přidat\n" "\n" "Řádek pro APT obsahuje typ, umístění a součásti kanálu, např. \"deb " "http://ftp.debian.org sarge main\"." @@ -1422,197 +1450,240 @@ msgstr "Velikost okna" msgid "Configure the sources for installable software and updates" msgstr "Konfigurovat zdroje pro instalovatelný software a aktualizace" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Udržováno komunitou (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Nesvobodný (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom s Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Udržováno komunitou (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Udržováno komunitou (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Udržováno komunitou (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Nesvobodné ovladače" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Omezený software (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom s Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualizace" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiálně podporováno" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Bezpečnostní aktualizace" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Aktualizace" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Udržováno komunitou (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Nesvobodný (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Oficiálně podporované" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Omezeno copyrightem" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Bezpečnostní aktualizace" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Aktualizace" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Bezpoečnostní Aktualizace" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilní software s Non-free závislostmi" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Žádný DFSG kompatibilní Software" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Stahuji %li. soubor z %li neznámou rychlostí" @@ -1651,8 +1722,8 @@ msgstr "Žádný DFSG kompatibilní Software" #~ msgstr "" #~ "Prozkoumává se systém\n" #~ "\n" -#~ "Aktualizace softwaru opravují chyby, eliminují bezpečnostní zranitelnosti a " -#~ "poskytují nové funkce." +#~ "Aktualizace softwaru opravují chyby, eliminují bezpečnostní zranitelnosti " +#~ "a poskytují nové funkce." #~ msgid "Oficially supported" #~ msgstr "Oficiálně podporované" @@ -1660,7 +1731,6 @@ msgstr "Žádný DFSG kompatibilní Software" #~ msgid "The following updates will be skipped:" #~ msgstr "Následující aktualizace budou přeskočeny:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Zhruba %li sekund zbývá" @@ -1737,14 +1807,14 @@ msgstr "Žádný DFSG kompatibilní Software" #~ msgstr "Ubuntu 6.06 LTS backporty" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" -#~ "Během prozkoumávání vašich zdrojů nebyla nalezený žádná platná položka pro " -#~ "upgrade.\n" +#~ "Během prozkoumávání vašich zdrojů nebyla nalezený žádná platná položka " +#~ "pro upgrade.\n" #~ msgid "Sections" #~ msgstr "Sekce" #~ msgid "Sections:" -#~ msgstr "Sekce:" \ No newline at end of file +#~ msgstr "Sekce:" diff --git a/po/da.po b/po/da.po index d74b0d31..ee6d9106 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:41+0000\n" "Last-Translator: Mathias-K \n" "Language-Team: Danish \n" @@ -34,7 +34,7 @@ msgid "Every two weeks" msgstr "Hver anden uge" #: ../SoftwareProperties/SoftwareProperties.py:144 -#, fuzzy +#, fuzzy, python-format msgid "Every %s days" msgstr "Hver %s. dag" @@ -55,6 +55,7 @@ msgstr "Efter en måned" msgid "After %s days" msgstr "Efter %s dage" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "%s opdateringer" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Hovedserver" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "Fejl ved fjernelse af nøgle" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Den valgte nøgle kunne ikke fjernes. Rapportér venligst dette som en fejl." @@ -164,6 +166,7 @@ msgstr "Kan ikke opgradere de krævede metapakker" msgid "A essential package would have to be removed" msgstr "Det ville være nødvendigt at fjerne en vital pakke" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Kunne ikke beregne opgraderingen" @@ -180,6 +183,7 @@ msgstr "" "Rapportér venligst denne fejl mod \"update-manager\"-pakken og inkludér " "filerne i /var/log/dist-upgrade/ i fejlrapporten." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Fejl ved godkendelse af nogle pakker" @@ -207,6 +211,7 @@ msgstr "" "Det var umuligt at installere en påkrævet pakke. Rapportér venligst dette " "som en fejl. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Kan ikke gætte metapakke" @@ -289,6 +294,7 @@ msgstr "" "her, vil alle linjer \"%s\" blive erstattet af \"%s\".\n" "Hvis du vælger \"Nej\", vil opdateringen blive annulleret." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Generér standardkilder?" @@ -360,6 +366,7 @@ msgstr "" "papirkurv og fjern midlertidige pakker fra tidligere installationer ved at " "køre 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Vil du starte opgraderingen?" @@ -437,6 +444,7 @@ msgstr "" "Et problem opstod under oprydningen. Se venligst længere nede for mere " "information. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Genskaber oprindelig systemtilstand" @@ -447,6 +455,7 @@ msgid "Fetching backport of '%s'" msgstr "Henter tilbageportering af \"%s\"" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -506,6 +515,7 @@ msgstr "Søger efter forældet software" msgid "System upgrade is complete." msgstr "Systemopgradering er fuldført" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -527,12 +537,13 @@ msgid "About %s remaining" msgstr "Omkring %s tilbage" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Henter fil %li af %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Anvender ændringer" @@ -547,10 +558,10 @@ msgid "" "The upgrade aborts now. Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"Opgraderingen afbrydes nu. Rapportér venligst denne fejl mod \"update-" -"manager\"-pakken og inkludér filerne i /var/log/dist-upgrade/ i " -"fejlrapporten." +"Opgraderingen afbrydes nu. Rapportér venligst denne fejl mod \"update-manager" +"\"-pakken og inkludér filerne i /var/log/dist-upgrade/ i fejlrapporten." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -576,9 +587,9 @@ msgstr "Der opstod en alvorlig fejl" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Rapportér venligst dette som en fejl og inkludér filerne /var/log/dist-" @@ -587,6 +598,7 @@ msgstr "" "Din oprindelige sources.list blev gemt i /etc/apt/sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -631,8 +643,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Dit system er opdateret" @@ -680,6 +693,7 @@ msgid "%li seconds" msgstr "%li sekunder" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -701,6 +715,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -813,6 +828,7 @@ msgstr "Kunne ikke hente udgivelsesnoterne" msgid "Please check your internet connection." msgstr "Undersøg venligst din internetforbindelse" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Kunne ikke køre opgraderingsværktøjet" @@ -916,14 +932,17 @@ msgstr "" "Fejl ved hentning af ændringslisten. Undersøg venligst din " "internetforbindelse." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Vigtige sikkerhedsopdateringer" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Anbefalede opdateringer" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Foreslåede opdateringer" @@ -936,113 +955,121 @@ msgstr "Tilbageporteringer" msgid "Distribution updates" msgstr "Distributionsopdateringer" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Andre opdateringer" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Henter listen med ændringer..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Fjern alle afkrydsninger" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Afkryds alle" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Overføringsstørrelse: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Vent venligst, dette kan tage et stykke tid." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Opdatering er gennemført" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Leder efter opdateringer" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Fra version %(old_version)s til %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Din distribution understøttes ikke længere" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" "Du vil ikke modtage yderligere sikkerhedrettelser eller kritiske " -"opdateringer. Opgradér til en senere version af Ubuntu Linux. Se " -"http://www.ubuntu.com (engelsk) for mere information om opgradering." +"opdateringer. Opgradér til en senere version af Ubuntu Linux. Se http://www." +"ubuntu.com (engelsk) for mere information om opgradering." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Ny distributionsudgivelse \"%s\" er tilgængelig" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Softwareindekset er ødelagt" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 "" "Det er ikke muligt at installere eller fjerne software. Brug venligst " -"pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo apt-get install -" -"f\" i en terminal for at fikse dette problem først." +"pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo apt-get install -f" +"\" i en terminal for at fikse dette problem først." +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 msgid "None" msgstr "Intet" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1068,8 +1095,8 @@ msgstr "Hold dit system opdateret" #: ../data/glade/UpdateManager.glade.h:5 msgid "Not all updates can be installed" msgstr "" -"Ikke alle opdateringer kan installeres \n" -" \n" +"Ikke alle opdateringer kan installeres\r\n" +"\r\n" "%s" #: ../data/glade/UpdateManager.glade.h:6 @@ -1414,191 +1441,234 @@ msgstr "Vinduesstørrelsen" msgid "Configure the sources for installable software and updates" msgstr "Konfigurér kilderne for installérbar software og opdateringer" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Vedligeholdt af fællesskabet" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Proprietære drivere til enheder" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Ikke-frit software" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Vedligeholdt af fællesskabet (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Vedligeholdt af fællesskabet (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Fri software vedligeholdt af fællesskabet" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Proprietære drivere" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Proprietære drivere til enheder " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Ikke-frit software (multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cd-rom med Ubuntu 6.06 LTS \"Dapper Drake\"" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Tilbageporterede opdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 sikkerhedsopdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 opdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 tilbageporteringer" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Understøttet officielt" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 sikkerhedsopdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 opdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 tilbageporteringer" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Vedligeholdt af fællesskabet (universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ikke-frit (multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Ikke længere officielt supporteret" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begrænset ophavsret" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 sikkerhedsopdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 opdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 tilbageporteringer" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" sikkerhedsopdateringer" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibel software med ikke-frie afhængigheder" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel software" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Henter fil %li af %li med ukendt hastighed" @@ -1621,7 +1691,8 @@ msgstr "Ikke-DFSG-kompatibel software" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Opgraderer til Ubuntu 6.06 LTS" +#~ "Opgraderer til Ubuntu 6.06 LTS" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1640,17 +1711,17 @@ msgstr "Ikke-DFSG-kompatibel software" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "Nogle opdateringer kræver yderligere software. Brug funktionen \"Vælg alle " -#~ "opgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo " -#~ "apt-get dist-upgrade\" i en terminal for at opdatere dit system fuldstændigt." +#~ "Nogle opdateringer kræver yderligere software. Brug funktionen \"Vælg " +#~ "alle opgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller kør " +#~ "\"sudo apt-get dist-upgrade\" i en terminal for at opdatere dit system " +#~ "fuldstændigt." #~ msgid "The following updates will be skipped:" #~ msgstr "Følgende opdateringer vil blive sprunget over:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Tid tilbage(ca.): %li sekunder" @@ -1727,4 +1798,4 @@ msgstr "Ikke-DFSG-kompatibel software" #~ msgstr "Ubuntu 6.06 LTS Opdateringer" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Ubuntu 6.06 LTS Backports" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS Backports" diff --git a/po/de.po b/po/de.po index 6a022620..94bfb9aa 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:37+0000\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" @@ -56,6 +56,7 @@ msgstr "Nach einem Monat" msgid "After %s days" msgstr "Nach %s Tagen" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "%s Aktualisierungen" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Haupt-Server" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,14 +127,13 @@ msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht." #: ../SoftwareProperties/SoftwareProperties.py:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -170,6 +172,7 @@ msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden" 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:220 msgid "Could not calculate the upgrade" msgstr "Die Aktualisierung konnte nicht berechnet werden" @@ -185,6 +188,7 @@ msgstr "" "Ein unlösbares Problem trat beim Berechnen der Aktualisierung auf. Bitte " "erstellen Sie hierfür einen Fehlerbericht." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete" @@ -213,6 +217,7 @@ msgstr "" "Ein erforderliches Paket konnte nicht installiert werden. Bitte erstellen " "Sie hierfür einen Fehlerbericht. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Metapaket konnte nicht bestimmt werden" @@ -258,8 +263,7 @@ msgstr "Zwischenspeicher wird ausgelesen" #: ../DistUpgrade/DistUpgradeControler.py:155 msgid "Fetch data from the network for the upgrade?" -msgstr "" -"Sollen die Daten für die Systemerweiterung aus dem Netz geholt werden?" +msgstr "Sollen die Daten für die Systemerweiterung aus dem Netz geholt werden?" #: ../DistUpgrade/DistUpgradeControler.py:156 msgid "" @@ -297,6 +301,7 @@ msgstr "" "wählen, werden alle Einträge von '%s' bis '%s' aktualisiert.\n" "Wenn Sie 'Nein' wählen, wird das Update abgebrochen." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Standardquellen generieren?" @@ -309,8 +314,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Nach dem Überprüfen Ihrer 'sources.list' wurde kein gültiger Eintrag für " -"'%s' gefunden.\n" +"Nach dem Überprüfen Ihrer 'sources.list' wurde kein gültiger Eintrag für '%" +"s' gefunden.\n" "\n" "Sollen Standardeinträge für '%s' hinzugefügt werden? Wenn Sie 'Nein' " "auswählen, wird das Update abgebrochen." @@ -370,6 +375,7 @@ msgstr "" "Plattenplatz auf %s frei. Leeren Sie Ihren Mülleimer und entfernen die " "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:440 msgid "Do you want to start the upgrade?" msgstr "Möchten Sie die Aktualisierung starten?" @@ -450,6 +456,7 @@ msgstr "" "Ein Problem trat beim Aufräumen auf. Bitte lesen Sie die unten stehende " "Nachricht für nähere Informationen. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Wiederherstellen des alten Systemzustandes" @@ -460,6 +467,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -519,6 +527,7 @@ msgstr "Nach veralteter Software wird gesucht" msgid "System upgrade is complete." msgstr "Aktualisierung ist abgeschlossen." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -546,6 +555,7 @@ msgstr "Datei %li von %li wird heruntergeladen" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Änderungen werden angewendet" @@ -564,8 +574,9 @@ msgstr "" "als einen Fehler des Pakets 'update-manager' und fügen Sie die Dateien in " "dem Verzeichnis '/var/log/dist-upgrade/' Ihrer Fehlermeldung hinzu." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -590,9 +601,9 @@ msgstr "Ein fataler Fehler ist aufgetreten" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Bitte melden Sie dies als Bug und fügen Sie die Dateien /var/log/dist-" @@ -602,29 +613,30 @@ msgstr "" "gespeichert." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%s Paket wird entfernt." msgstr[1] "%s Pakete werden entfernt." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s neues Paket wird installiert." msgstr[1] "%s neue Pakete werden installiert." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s Paket wird aktualisiert." msgstr[1] "%s Pakete werden aktualisiert." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -648,8 +660,9 @@ msgstr "" "Um Datenverlust zu vermeiden, schließen Sie alle offenen Anwendungen und " "Dokumente." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Ihr System ist auf dem aktuellen Stand" @@ -695,6 +708,7 @@ msgid "%li seconds" msgstr "%li Sekunden" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -716,6 +730,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -829,6 +844,7 @@ msgstr "Freigabemitteilungen konnten nicht heruntergeladen werden" msgid "Please check your internet connection." msgstr "Bitte überprüfen Sie Ihre Internet-Verbindung." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Konnte die Anwendung zur Aktualisierung nicht starten" @@ -906,12 +922,12 @@ msgstr "" "Möglicherweise gibt es Probleme im Netzwerk oder am Server. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Datei %li von %li wird mit %s/s heruntergeladen" @@ -937,14 +953,17 @@ msgstr "" "Die Liste mit Änderungen konnte nicht heruntergeladen werden. Bitte " "überprüfen Sie Ihre Internet-Verbindung." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Wichtige Sicherheitsaktualisierungen" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Empfohlene Updates" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Vorgeschlagene Aktualisierungen" @@ -959,74 +978,77 @@ msgstr "Ubuntu 5.10 Backports" msgid "Distribution updates" msgstr "_Aktualisierung fortsetzen" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Andere Aktualisierungen" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Liste mit Änderungen wird heruntergeladen..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Prüfen" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Download-Größe: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Aktualisierung ist abgeschlossen" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Nach verfügbaren Aktualisierungen suchen" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Neue Version: %s (Größe: %s)" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Größe: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Ihre Distribution wird nicht länger unterstützt" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -1034,20 +1056,20 @@ msgid "" msgstr "" "Sie werden keine weiteren Aktualisierungen zur Behebung von " "Sicherheitslücken oder kritischen Fehlern erhalten. Aktualisieren Sie Ihr " -"System auf eine neuere Version von Ubuntu Linux. Auf " -"http://www.ubuntuusers.de oder http://www.ubuntu.com finden Sie weitere " -"Informationen hierzu." +"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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Neue Version '%s' der Distribution ist freigegeben" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Der Software-Index ist beschädigt" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1057,19 +1079,23 @@ 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 "Keine" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1086,8 +1112,8 @@ msgstr "" "Sie müssen manuell auf Aktualisierungen prüfen\n" "\n" "Ihr System prüft nicht automatisch auf verfügbare Aktualisierungen. Sie " -"können dieses Verhalten über die Menüpunkte \"System\" -> " -"\"Systemverwaltung\" -> \"Software Eigenschaften\" ändern." +"können dieses Verhalten über die Menüpunkte \"System\" -> \"Systemverwaltung" +"\" -> \"Software Eigenschaften\" ändern." #: ../data/glade/UpdateManager.glade.h:4 msgid "Keep your system up-to-date" @@ -1447,187 +1473,231 @@ msgstr "" "Software-Kanäle und Einstellungen für die automatische Aktualisierung " "festlegen" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Von der Ubuntu-Gemeinde betreut" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Proprietäre Gerätetreiber" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Eingeschränkte Software" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM mit Ubuntu 6.10 \"Edgy Eft\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Von der Gemeinschaft betreut (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Von der Gemeinschaft betreut (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Von der Ubuntu-Gemeinde betreute Open Source-Software" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Proprietäre Treiber" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Proprietäre Gerätetreiber " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Eingeschränkte Software (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM mit Ubuntu 6.06 LTS »Dapper Drake«" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Zurückportierte Aktualisierungen" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM mit Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM mit Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Offiziell unterstützt" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Aktualisierungen" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Von der Gemeinschaft verwaltet (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Unfrei (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM mit Ubuntu 4.10 »Warty Warthog«" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Eingeschränktes Copyright" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Aktualisierungen" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Sicherheitsaktualisierungen" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" @@ -1635,7 +1705,6 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "Urheberrechtlich oder gesetzlich eingeschränkte Software" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "" #~ "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen" @@ -1659,7 +1728,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Auf Ubuntu 6.10 aktualisieren" +#~ "Auf Ubuntu 6.10 aktualisieren" #~ msgid "Important security updates of Ubuntu" #~ msgstr "Wichtige Sicherheitsaktualisierungen von Ubuntu" @@ -1686,8 +1756,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Einige Aktualisierungen erfordern das Entfernen von anderen Anwendungen. " #~ "Verwenden Sie die Funktion »Aktualisierungen vormerken« in der Synaptic " @@ -1697,7 +1767,6 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "The following updates will be skipped:" #~ msgstr "Die folgenden Aktualisierungen werden ausgelassen:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Ungefähr %li Sekunden verbleibend" @@ -1706,8 +1775,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" -#~ "Die Aktualisierung wird jetzt abgebrochen. Bitte erstellen Sie hierfür einen " -#~ "Fehlerbericht." +#~ "Die Aktualisierung wird jetzt abgebrochen. Bitte erstellen Sie hierfür " +#~ "einen Fehlerbericht." #~ msgid "Upgrading Ubuntu" #~ msgstr "Ubuntu aktualisieren" @@ -1726,7 +1795,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." #~ msgstr "" -#~ "Bitte schließen Sie zuerst andere Anwendungen wie 'aptitude' oder 'Synaptic'." +#~ "Bitte schließen Sie zuerst andere Anwendungen wie 'aptitude' oder " +#~ "'Synaptic'." #~ msgid "Channels" #~ msgstr "Kanäle" @@ -1777,12 +1847,12 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "The upgrade aborts now. Please free at least %s of disk space. Empty your " -#~ "trash and remove temporary packages of former installations using 'sudo apt-" -#~ "get clean'." +#~ "trash and remove temporary packages of former installations using 'sudo " +#~ "apt-get clean'." #~ msgstr "" -#~ "Die Aktualisierung wird jetzt abgebrochen. Bitte schaffen Sie mindestens %s " -#~ "an freien Festplattenspeicher. Leeren Sie ihren Mülleimer und entfernen Sie " -#~ "temporäre Pakete von früheren Installationen mit »sudo apt-get clean«." +#~ "Die Aktualisierung wird jetzt abgebrochen. Bitte schaffen Sie mindestens %" +#~ "s an freien Festplattenspeicher. Leeren Sie ihren Mülleimer und entfernen " +#~ "Sie temporäre Pakete von früheren Installationen mit »sudo apt-get clean«." #~ msgid "%s remaining" #~ msgstr "%s verbleiben" @@ -1791,27 +1861,27 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgstr "Keinen gültigen Eintrag gefunden" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Beim Lesen Ihrer Kanalliste konnte kein gültiger Eintrag für die " #~ "Aktualisierung gefunden werden.\n" #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "is now run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery is now run (dpkg --configure -a)." #~ msgstr "" #~ "Die Aktualisierung wird jetzt abgebrochen. Ihr System könnte in einem " #~ "unbenutzbaren Zustand sein. Ein Wiederherstellungsversuch wird nun " #~ "unternommen (dpkg --configure -a)." #~ msgid "" -#~ "Please report this as a bug and include the files '/var/log/dist-" -#~ "upgrade.log' and '/var/log/dist-upgrade-apt.log' in your report. The upgrade " +#~ "Please report this as a bug and include the files '/var/log/dist-upgrade." +#~ "log' and '/var/log/dist-upgrade-apt.log' in your report. The upgrade " #~ "aborts now. " #~ msgstr "" -#~ "Bitte füllen Sie einen Fehlerbericht hierzu aus und legen Sie die Dateien » " -#~ "»/var/log/dist-upgrade.log« und »/var/log/dist-upgrade-apt.log« Ihren " +#~ "Bitte füllen Sie einen Fehlerbericht hierzu aus und legen Sie die Dateien " +#~ "» »/var/log/dist-upgrade.log« und »/var/log/dist-upgrade-apt.log« Ihren " #~ "Bericht bei. Die Aktualisierung wird jetzt abgebrochen. " #~ msgid "" @@ -1856,13 +1926,14 @@ msgstr "Nicht DFSG-kompatible Software" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "Änderungen werden " -#~ "heruntergeladen\n" +#~ "Änderungen werden heruntergeladen\n" #~ "\n" #~ "Die Änderungen müssen vom zentralen Server abgerufen werden" #~ msgid "Show available updates and choose which to install" -#~ msgstr "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen" +#~ msgstr "" +#~ "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen" #, fuzzy #~ msgid "Error fetching the packages" @@ -1889,13 +1960,14 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Verfügbare Aktualisierungen\n" #~ "\n" -#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung kann " -#~ "durch einen Klick auf die Schaltfläche »Installieren« vorgenommen werden." +#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung " +#~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen " +#~ "werden." #~ msgid "Repository" #~ msgstr "Repository" @@ -1924,12 +1996,12 @@ msgstr "Nicht DFSG-kompatible Software" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Hinzufügen einer neuen Schlüsseldatei zum vertrauenswürdigen Schlüsselbund. " -#~ "Stellen Sie sicher, dass der Schlüssel über eine sichere Verbindung bezogen " -#~ "wurde und dass der Besitzer vertrauenswürdig ist. " +#~ "Hinzufügen einer neuen Schlüsseldatei zum vertrauenswürdigen " +#~ "Schlüsselbund. Stellen Sie sicher, dass der Schlüssel über eine sichere " +#~ "Verbindung bezogen wurde und dass der Besitzer vertrauenswürdig ist. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "_Temporäre Paketdateien automatisch löschen" @@ -1951,11 +2023,12 @@ msgstr "Nicht DFSG-kompatible Software" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Zurücksetzen der Vorgabeschlüssel, welche mit der Distribution ausgeliefert " -#~ "wurden. Vom Benutzer installierte Schlüssel werden dadurch nicht geändert." +#~ "Zurücksetzen der Vorgabeschlüssel, welche mit der Distribution " +#~ "ausgeliefert wurden. Vom Benutzer installierte Schlüssel werden dadurch " +#~ "nicht geändert." #~ msgid "Set _maximum size for the package cache" #~ msgstr "_Begrenzen der Größe des Paketzwischenspeichers" @@ -1980,8 +2053,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" #~ "Dies bedeutet, dass einige Abhängigkeiten der installierten Pakete nicht " -#~ "aufgelöst sind. Verwenden Sie bitte »Synaptic« oder »apt-get« zur Behebung " -#~ "des Problems." +#~ "aufgelöst sind. Verwenden Sie bitte »Synaptic« oder »apt-get« zur " +#~ "Behebung des Problems." #~ msgid "It is not possible to upgrade all packages." #~ msgstr "Es ist nicht möglich, alle Pakete zu aktualisieren." @@ -1989,12 +2062,13 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Dies bedeutet, dass neben der momentanen Aktualisierung der Pakete weitere " -#~ "Aktionen, wie das Installieren oder Entfernen von Paketen, notwendig sind. " -#~ "Verwenden Sie bitte die »Intelligente Aktualisierung« von Synaptic oder »apt-" -#~ "get dist-upgrade« zur Behebung des Problems." +#~ "Dies bedeutet, dass neben der momentanen Aktualisierung der Pakete " +#~ "weitere Aktionen, wie das Installieren oder Entfernen von Paketen, " +#~ "notwendig sind. Verwenden Sie bitte die »Intelligente Aktualisierung« von " +#~ "Synaptic oder »apt-get dist-upgrade« zur Behebung des Problems." #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" @@ -2005,8 +2079,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgstr "Die Aktualisierungen werden ausgeführt." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Es kann immer nur eine Anwendung zur Paketverwaltung zur gleichen Zeit " #~ "ausgeführt werden. Bitte beenden Sie zuerst die andere Anwendung." @@ -2019,20 +2093,20 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Verwenden Sie bitte eine aktuellere Version von Ubuntu-Linux. Für die " #~ "momentan laufende Version werden keine Sicherheits- und andere kritische " -#~ "Aktualisierungen mehr bereitgestellt. Informationen zur Systemaktualisierung " -#~ "finden Sie unter http://www.ubuntulinux.org." +#~ "Aktualisierungen mehr bereitgestellt. Informationen zur " +#~ "Systemaktualisierung finden Sie unter http://www.ubuntulinux.org." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Eine neue Version von Ubuntu ist verfügbar!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Eine neue Version mit dem Codenamen »%s« ist verfügbar. Informationen zur " #~ "Aktualisierung des Systems erhalten Sie unter http://www.ubuntulinux.org." @@ -2042,8 +2116,8 @@ msgstr "Nicht DFSG-kompatible Software" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" #~ "Es kann immer nur eine Anwendung zur Paketverwaltung zur gleichen Zeit " #~ "ausgeführt werden. Bitte beenden Sie zuerst die andere Anwendung." @@ -2052,7 +2126,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgstr "Initialisierung und Abrufen der Aktualisierungsliste..." #~ msgid "You need to be root to run this program" -#~ msgstr "Sie benötigen Administrationsrechte, um diese Anwendung auszuführen." +#~ msgstr "" +#~ "Sie benötigen Administrationsrechte, um diese Anwendung auszuführen." #~ msgid "Edit software sources and settings" #~ msgstr "Bearbeiten der Software-Quellen und Einstellungen" @@ -2075,15 +2150,17 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "Ubuntu CD Image Automatic Signing Key " #~ msgstr "" -#~ "Automatischer Signaturschlüssel für das Ubuntu-CD-Image " +#~ "Automatischer Signaturschlüssel für das Ubuntu-CD-Image " #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Verfügbare Aktualisierungen\n" #~ "\n" -#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung kann " -#~ "durch einen Klick auf die Schaltfläche »Installieren« vorgenommen werden." \ No newline at end of file +#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung " +#~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen " +#~ "werden." diff --git a/po/el.po b/po/el.po index e5980add..152bc4a7 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:37+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -54,6 +54,7 @@ msgstr "Μετά από ένα μήνα" msgid "After %s days" msgstr "Μετά από %s ημέρες" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "%s ενημερώσεις" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Κύριος εξυπηρετητής" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "Σφάλμα απομάκρυνσης κλειδιού" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Το κλειδί που επιλέξατε δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε αυτό " "ως σφάλμα." @@ -167,6 +169,7 @@ msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετ msgid "A essential package would have to be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" @@ -183,6 +186,7 @@ msgstr "" "Παρακαλώ αναφέρετε το ως σφάλμα στο πακέτο 'update-manager' και επισυνάψτε " "στην αναφορά σφάλματος τα αρχεία στο /var/log/dist-upgrade/." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" @@ -210,6 +214,7 @@ msgstr "" "Δεν ήταν δυνατή η αναβάθμιση του απαιτούμενου πακέτου. Παρακαλώ αναφέρετε το " "ως σφάλμα. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" @@ -292,6 +297,7 @@ msgstr "" "εδώ 'Ναι' θα ενημερωθούν όλες οι '%s' καταχωρίσεις σε '%s'.\n" " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Δημιουργία προεπιλεγμένων πηγών;" @@ -304,8 +310,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Μετά τον έλεγχο του 'sources.list' δεν βρέθηκε έγκυρη καταχώριση για το " -"'%s'.\n" +"Μετά τον έλεγχο του 'sources.list' δεν βρέθηκε έγκυρη καταχώριση για το '%" +"s'.\n" "\n" "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε " "'Όχι' η ενημέρωση θα ακυρωθεί." @@ -364,6 +370,7 @@ msgstr "" "στο %s. Αδειάστε τα απορρίμματα σας και απομακρύνετε τα προσωρινά πακέτα " "προηγούμενων εγκαταστάσεων με την εντολή 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;" @@ -441,6 +448,7 @@ msgstr "" "Δημιουργήθηκαν ορισμένα προβλήματα κατά την εκκαθάριση. Παρακαλώ δείτε το " "παρακάτω μήνυμα για περισσότερες πληροφορίες. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος" @@ -451,6 +459,7 @@ msgid "Fetching backport of '%s'" msgstr "Λήψη backport του '%s'" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -510,6 +519,7 @@ msgstr "Γίνεται αναζήτηση για παρωχημένο λογισ msgid "System upgrade is complete." msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -520,7 +530,7 @@ msgid "Fetching is complete" msgstr "Η λήψη ολοκληρώθηκε" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Λήψη αρχείου %li από %li με %s/s" @@ -531,12 +541,13 @@ msgid "About %s remaining" msgstr "Απομένουν περίπου %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Λήψη αρχείου %li από %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Γίνεται εφαρμογή αλλαγών" @@ -555,6 +566,7 @@ msgstr "" "'update-manager' και συμπεριλάβετε και τα αρχεία του /var/log/dist-upgrade/ " "στην αναφορά σφάλματος." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -580,18 +592,19 @@ msgstr "Προέκυψε μοιραίο σφάλμα" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Παρακαλώ αναφέρετε το ως σφάλμα και επισυνάψτε τα αρχεία /var/log/dist-" "upgrade/main.log και /var/log/dist-upgrade/apt.log στην αναφορά σας. Η " "αναβάθμιση τώρα θα τερματιστεί. \n" -"Το αρχικό αρχείο sources.list αποθηκεύτηκε στο " -"/etc/apt/sources.list.distUpgrade." +"Το αρχικό αρχείο sources.list αποθηκεύτηκε στο /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -639,8 +652,9 @@ msgstr "" "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και " "έγγραφα." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Το σύστημα σας είναι ενημερωμένο" @@ -688,6 +702,7 @@ msgid "%li seconds" msgstr "%li δευτερόλεπτα" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -709,6 +724,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -822,6 +838,7 @@ msgstr "Αδυναμία λήψης των σημειώσεων έκδοσης" msgid "Please check your internet connection." msgstr "Παρακαλώ ελέγξτε τη σύνδεση σας με το διαδίκτυο." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Αδυναμία εκτέλεσης του εργαλείου αναβαθμίσεων" @@ -839,8 +856,7 @@ msgstr "Λήψη του εργαλείου αναβάθμισης" #: ../UpdateManager/DistUpgradeFetcher.py:173 msgid "The upgrade tool will guide you through the upgrade process." -msgstr "" -"Το εργαλείο αναβάθμισης θα σας καθοδηγήσει στην διαδικασία ενημέρωσης" +msgstr "Το εργαλείο αναβάθμισης θα σας καθοδηγήσει στην διαδικασία ενημέρωσης" #: ../UpdateManager/DistUpgradeFetcher.py:180 msgid "Upgrade tool signature" @@ -856,8 +872,7 @@ msgstr "Αποτυχία λήψης" #: ../UpdateManager/DistUpgradeFetcher.py:209 msgid "Fetching the upgrade failed. There may be a network problem. " -msgstr "" -"Η λήψη της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου. " +msgstr "Η λήψη της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου. " #: ../UpdateManager/DistUpgradeFetcher.py:214 msgid "Failed to extract" @@ -927,14 +942,17 @@ msgstr "" "Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Σημαντικές ενημερώσεις ασφαλείας" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Συνιστώμενες ενημερώσεις" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Προτεινόμενες ενημερώσεις" @@ -947,72 +965,75 @@ msgstr "Backports" msgid "Distribution updates" msgstr "Αναβαθμίσεις διανομής" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Άλλες ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Έκδοση %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Λήψη της λίστας των αλλαγών..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "Α_ποεπιλογή όλων" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "Έλε_γχος όλων" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Μέγεθος λήψης: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση" msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Η ενημέρωση ολοκληρώθηκε" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Έλεγχος για ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Από έκδοση: %(old_version)s σε %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Έκδοση %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Μέγεθος: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Η διανομή σας δεν υποστηρίζεται πια" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1023,16 +1044,17 @@ msgstr "" "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες " "για την αναβάθμιση." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Είναι διαθέσιμη νέα έκδοση διανομής '%s'" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1064,23 @@ 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 "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1079,8 +1105,7 @@ msgstr "Διατηρήστε το σύστημα σας ενημερωμ #: ../data/glade/UpdateManager.glade.h:5 msgid "Not all updates can be installed" -msgstr "" -"Δεν είναι δυνατή η εγκατάσταση όλων των ενημερώσεων" +msgstr "Δεν είναι δυνατή η εγκατάσταση όλων των ενημερώσεων" #: ../data/glade/UpdateManager.glade.h:6 msgid "Starting update manager" @@ -1422,193 +1447,236 @@ msgstr "Το μέγεθος του παραθύρου" msgid "Configure the sources for installable software and updates" msgstr "Ρύθμιση των πηγών για λογισμικό και ενημερώσεις" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Community maintained" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Οδηγοί με κλειστό κώδικα για συσκευές" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Λογισμικό με περιορισμούς" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom με το Ubuntu 6.10 'Edgy Eft" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 TLS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Community maintained (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Υποστηριζόμενα από την κοινότητα (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Community maintained Open Source software" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Όχι-ελεύθεροι οδηγοί" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Οδηγοί με κλειστό κώδικα για συσκευές " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom με Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Backported ενημερώσεις" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officially supported" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ενημερώσεις Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Δεν υποστηρίζονται πια επίσημα" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Περιορισμένα πνευματικά δικαιώματα" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ενημερώσεις ασφαλείας Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ενημερώσεις Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" @@ -1649,16 +1717,16 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgstr "" #~ "Γίνεται ανάλυση του συστήματος σας\n" #~ "\n" -#~ "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " -#~ "να παρέχουν νέες λειτουργίες." +#~ "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας " +#~ "και να παρέχουν νέες λειτουργίες." #~ msgid "Oficially supported" #~ msgstr "Oficially supported" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Μερικές ενημερώσεις απαιτούν την απομάκρυνση επιπρόσθετου λογισμικού. " #~ "Χρησιμοποιήστε την λειτουργία \"Σημείωση όλων των αναβαθμίσεων\" από το " @@ -1668,7 +1736,6 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgid "The following updates will be skipped:" #~ msgstr "Οι παρακάτω ενημερώσεις θα παρακαμφθούν:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Απομένουν περίπου %li δευτερόλεπτα" @@ -1693,7 +1760,8 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." #~ msgstr "" -#~ "Παρακαλώ κλείστε την άλλη εφαρμογή πρώτα π.χ. το 'aptitude' ή το 'Synaptic'." +#~ "Παρακαλώ κλείστε την άλλη εφαρμογή πρώτα π.χ. το 'aptitude' ή το " +#~ "'Synaptic'." #~ msgid "Channels" #~ msgstr "Κανάλια" @@ -1746,13 +1814,14 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgstr "Μη έγκυρες πληροφορίες πακέτου" #~ msgid "" -#~ "Failed to download the listof changes. Please check your internet connection." +#~ "Failed to download the listof changes. Please check your internet " +#~ "connection." #~ msgstr "" #~ "Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας." #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Κατά τον έλεγχο των πληροφοριών του repository δεν βρέθηκαν έγκυρες " #~ "καταχωρίσεις αναβάθμισης.\n" @@ -1783,24 +1852,25 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgstr "Το αρχείο '%s' δεν περιέχει έγκυρα κανάλια λογισμικού." #~ msgid "" -#~ "The upgrade is finished now. A reboot is required to now, do you want to do " -#~ "this now?" +#~ "The upgrade is finished now. A reboot is required to now, do you want to " +#~ "do this now?" #~ msgstr "" #~ "Η αναβάθμιση ολοκληρώθηκε. Απαιτείται επανεκκίνηση, θέλετε να γίνει τώρα;" #~ msgid "" -#~ "You need to manually reload the latest information about " -#~ "updates\n" +#~ "You need to manually reload the latest information about updates\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" -#~ "Πρέπει να ανανεώσετε χειροκίνητα τις τελευταίες πληροφορίες για τις " -#~ "ενημερώσεις\n" +#~ "Πρέπει να ανανεώσετε χειροκίνητα τις τελευταίες πληροφορίες για " +#~ "τις ενημερώσεις\n" #~ "\n" -#~ "Το σύστημα σας δεν έχει ρυθμιστεί να κάνει αυτόματο έλεγχο για ενημερώσεις. " -#~ "Μπορείτε να ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού \"Σύστημα\" -> " -#~ "\"Διαχείριση συστήματος\" -> \"Ιδιότητες λογισμικού\"." +#~ "Το σύστημα σας δεν έχει ρυθμιστεί να κάνει αυτόματο έλεγχο για " +#~ "ενημερώσεις. Μπορείτε να ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού " +#~ "\"Σύστημα\" -> \"Διαχείριση συστήματος\" -> \"Ιδιότητες λογισμικού\"." #~ msgid "" #~ "Downloading changes\n" @@ -1822,4 +1892,4 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgstr "Ubuntu 6.04 \"Dapper Drake\"" #~ msgid "Ubuntu 5.10 \"Breezy Badger\"" -#~ msgstr "Ubuntu 5.10 \"Breezy Badger\"" \ No newline at end of file +#~ msgstr "Ubuntu 5.10 \"Breezy Badger\"" diff --git a/po/en_AU.po b/po/en_AU.po index 4813e497..f3bc426b 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-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-09-11 09:53+0000\n" "Last-Translator: David Satchell \n" "Language-Team: English (Australia) \n" @@ -55,6 +55,7 @@ msgstr "After one month" msgid "After %s days" msgstr "After %s days" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "%s updates" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Main server" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "Error removing the key" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -161,6 +163,7 @@ msgstr "Can't upgrade required meta-packages" 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:220 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" @@ -173,6 +176,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" @@ -200,6 +204,7 @@ msgstr "" "It was impossible to install a required package. Please report this as a " "bug. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Can't guess meta-packag" @@ -275,6 +280,7 @@ msgstr "" "here it will update all '%s' to '%s' entries.\n" "If you select 'no' the update will cancel." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Generate default sources?" @@ -342,6 +348,7 @@ msgstr "" "your Garbage Bin and remove temporary packages of former installations using " "'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" @@ -413,6 +420,7 @@ msgstr "" "A problem occured during the clean-up. Please see the below message for more " "information. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Restoring original system state" @@ -423,6 +431,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -478,6 +487,7 @@ msgstr "Searching for obsolete software" msgid "System upgrade is complete." msgstr "System upgrade is complete." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -505,6 +515,7 @@ msgstr "Fetching file %li of %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Applying changes" @@ -522,6 +533,7 @@ msgstr "" "The upgrade has aborted. Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ in the bugreport." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -545,17 +557,18 @@ msgstr "A fatal error occured" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade has aborted.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " +"aborted.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -600,8 +613,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Your system is up-to-date" @@ -647,6 +661,7 @@ msgid "%li seconds" msgstr "%li seconds" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -668,6 +683,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -777,6 +793,7 @@ msgstr "Could not download the release notes" msgid "Please check your internet connection." msgstr "Please check your internet connection." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Could not run the upgrade tool" @@ -871,14 +888,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Important security updates" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Recommended updates" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Proposed updates" @@ -891,71 +911,74 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Other updates" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Download size: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Size: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Your distribution is not supported anymore" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -965,16 +988,17 @@ msgstr "" "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "New distribution release '%s' is available" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -984,19 +1008,23 @@ 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 "None" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1333,190 +1361,233 @@ msgstr "The window size" msgid "Configure the sources for installable software and updates" msgstr "Configure the sources for installable software and updates" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Community maintained" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Proprietary drivers for devices" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Restricted software" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM with Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Community maintained (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Community maintained Open Source software" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Non-free drivers" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Proprietary drivers for devices " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Restricted software (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM with Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Backported updates" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officially supported" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Security Updates" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-compatible Software with Non-Free Dependencies" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Non-DFSG-compatible Software" -#, python-format #~ msgid "" #~ "Error scaning the CD\n" #~ "\n" @@ -1527,22 +1598,22 @@ msgstr "Non-DFSG-compatible Software" #~ "%s" #~ msgid "" -#~ "A unresolvable problem occured while calculating the upgrade. Please report " -#~ "this as a bug. " +#~ "A unresolvable problem occured while calculating the upgrade. Please " +#~ "report this as a bug. " #~ msgstr "" -#~ "An unresolvable problem occured while calculating the upgrade. Please report " -#~ "this as a bug. " +#~ "An unresolvable problem occured while calculating the upgrade. Please " +#~ "report this as a bug. " #~ 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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." #~ msgstr "" -#~ "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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." @@ -1556,11 +1627,11 @@ msgstr "Non-DFSG-compatible Software" #~ "synaptic." #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "was run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery was run (dpkg --configure -a)." #~ msgstr "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "was run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery was run (dpkg --configure -a)." #~ msgid "Some software no longer officially supported" #~ msgstr "Some software no longer officially supported" @@ -1581,7 +1652,6 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "Restoring originale system state" #~ msgstr "Restoring original system state" -#, python-format #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore.\n" @@ -1591,37 +1661,30 @@ msgstr "Non-DFSG-compatible Software" #~ "not be found anymore.\n" #~ "This indicates a serious error, please report this as a bug." -#, python-format #~ msgid "About %li days %li hours %li minutes remaining" #~ msgstr "About %li days %li hours %li minutes remaining" -#, python-format #~ msgid "About %li hours %li minutes remaining" #~ msgstr "About %li hours %li minutes remaining" -#, python-format #~ msgid "About %li minutes remaining" #~ msgstr "About %li minutes remaining" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "About %li seconds remaining" #~ msgid "Download is complete" #~ msgstr "Download is complete" -#, python-format #~ msgid "Downloading file %li of %li at %s/s" #~ msgstr "Downloading file %li of %li at %s/s" -#, python-format #~ msgid "Downloading file %li of %li" #~ msgstr "Downloading file %li of %li" #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "The upgrade aborts now. Please report this bug." -#, python-format #~ msgid "" #~ "Replace configuration file\n" #~ "'%s'?" @@ -1631,41 +1694,41 @@ msgstr "Non-DFSG-compatible Software" #~ "'%s'?" #~ msgid "" -#~ "Please report this as a bug and include the files /var/log/dist-upgrade.log " -#~ "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" +#~ "Please report this as a bug and include the files /var/log/dist-upgrade." +#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts " +#~ "now.\n" #~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." #~ msgstr "" -#~ "Please report this as a bug and include the files /var/log/dist-upgrade.log " -#~ "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" +#~ "Please report this as a bug and include the files /var/log/dist-upgrade." +#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts " +#~ "now.\n" #~ "\n" #~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#, python-format #~ msgid "%s package is going to be removed." #~ msgid_plural "%s packages are going to be removed." #~ msgstr[0] "%s package is going to be removed." #~ msgstr[1] "%s packages are going to be removed." -#, python-format #~ msgid "%s new package is going to be installed." #~ msgid_plural "%s new packages are going to be installed." #~ msgstr[0] "%s new package is going to be installed." #~ msgstr[1] "%s new packages are going to be installed." -#, python-format #~ msgid "%s package is going to be upgraded." #~ msgid_plural "%s packages are going to be upgraded." #~ msgstr[0] "%s package is going to be upgraded." #~ msgstr[1] "%s packages are going to be upgraded." -#, python-format #~ msgid "You have to download a total of %s." #~ msgstr "You have to download a total of %s." #~ msgid "" -#~ "The upgrade can take several hours and cannot be canceled at any time later." +#~ "The upgrade can take several hours and cannot be canceled at any time " +#~ "later." #~ msgstr "" -#~ "The upgrade can take several hours and cannot be canceled at any time later." +#~ "The upgrade can take several hours and cannot be canceled at any time " +#~ "later." #~ msgid "Could not find any upgrades" #~ msgstr "Could not find any upgrades" @@ -1685,17 +1748,15 @@ msgstr "Non-DFSG-compatible Software" #~ msgstr "Upgrading Ubuntu" #~ msgid "" -#~ "Verfing the upgrade failed. There may be a problem with the network or with " -#~ "the server. " +#~ "Verfing the upgrade failed. There may be a problem with the network or " +#~ "with the server. " #~ msgstr "" #~ "Verifying the upgrade failed. There may be a problem with the network or " #~ "with the server. " -#, python-format #~ msgid "Downloading file %li of %li with %s/s" #~ msgstr "Downloading file %li of %li with %s/s" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Downloading file %li of %li with unknown speed" @@ -1714,12 +1775,12 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgid "The following updates will be skipped:" #~ msgstr "The following updates will be skipped:" @@ -1733,12 +1794,12 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "Show details" #~ msgstr "Show details" -#, python-format #~ msgid "New version: %s (Size: %s)" #~ msgstr "New version: %s (Size: %s)" #~ msgid "Only one software management tool is allowed to run at the same time" -#~ msgstr "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Only one software management tool is allowed to run at the same time" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." @@ -1748,14 +1809,16 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "" #~ "You must check for updates manually\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" #~ "You must check for updates manually\n" #~ "\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behaviour in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behaviour in \"System\" -> \"Administration\" -> \"Software " +#~ "Properties\"." #~ msgid "" #~ "Examining your system\n" @@ -1796,16 +1859,16 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "" #~ "The channel information is out-of-date\n" #~ "\n" -#~ "You have to reload the channel information to install software and updates " -#~ "from newly added or changed channels. \n" +#~ "You have to reload the channel information to install software and " +#~ "updates from newly added or changed channels. \n" #~ "\n" #~ "You need a working internet connection to continue." #~ msgstr "" #~ "The channel information is out-of-date\n" #~ "\n" #~ "\n" -#~ "You have to reload the channel information to install software and updates " -#~ "from newly added or changed channels. \n" +#~ "You have to reload the channel information to install software and " +#~ "updates from newly added or changed channels. \n" #~ "\n" #~ "\n" #~ "You need a working internet connection to continue." @@ -1817,14 +1880,14 @@ msgstr "Non-DFSG-compatible Software" #~ msgstr "Components" #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." #~ msgstr "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." @@ -1845,19 +1908,19 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "" #~ "If automatic checking for updates is disabeld, you have to reload the " -#~ "channel list manually. This option allows to hide the reminder shown in this " -#~ "case." +#~ "channel list manually. This option allows to hide the reminder shown in " +#~ "this case." #~ msgstr "" #~ "If automatic checking for updates is disabled, you have to reload the " -#~ "channel list manually. This option allows to hide the reminder shown in this " -#~ "case." +#~ "channel list manually. This option allows to hide the reminder shown in " +#~ "this case." #~ msgid "" #~ "Stores the state of the expander that contains the list of changs and the " #~ "description" #~ msgstr "" -#~ "Stores the state of the expander that contains the list of changes and the " -#~ "description" +#~ "Stores the state of the expander that contains the list of changes and " +#~ "the description" #~ msgid "Configure software channels and internet updates" #~ msgstr "Configure software channels and internet updates" @@ -1875,4 +1938,4 @@ msgstr "Non-DFSG-compatible Software" #~ msgstr "Ubuntu 6.06 LTS Updates" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Ubuntu 6.06 LTS Backports" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS Backports" diff --git a/po/en_CA.po b/po/en_CA.po index d650cf9c..11810e63 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-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:42+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -56,13 +56,15 @@ msgstr "" msgid "After %s days" msgstr "" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "_Install" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,8 +127,7 @@ msgid "Error removing the key" msgstr "Error removing the key" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -163,6 +165,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -177,6 +180,7 @@ msgid "" 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:246 msgid "Error authenticating some packages" msgstr "" @@ -201,6 +205,7 @@ msgid "" msgstr "" "The key you selected could not be removed. Please report this as a bug. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -260,6 +265,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -317,6 +323,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -379,6 +386,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -389,6 +397,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 #, fuzzy @@ -443,6 +452,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -470,6 +480,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 #, fuzzy msgid "Applying changes" @@ -486,6 +497,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -509,13 +521,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -555,8 +568,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" @@ -603,6 +617,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -622,6 +637,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -732,6 +748,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -830,15 +847,18 @@ msgstr "" "Failed to download changes. Please check if there is an active internet " "connection." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -854,110 +874,118 @@ msgstr "Ubuntu 5.04 Updates" msgid "Distribution updates" msgstr "Upgrade finished" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "_Install" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Cancel downloading the ChangeLog" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:633 +#, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "_Install" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Version %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1217,8 +1245,8 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Enter the complete APT line of the repository that you want to " -"add\n" +"Enter the complete APT line of the repository that you want to add\n" "\n" "The APT line contains the type, location and content of a repository, for " "example \"deb http://ftp.debian.org sarge main\". You can find a " @@ -1306,210 +1334,255 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.04 Updates" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Community maintained (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Contributed software" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Community maintained (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Community maintained (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officially supported" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.04 Security Updates" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Officially supported" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.04 Updates" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian Stable Security Updates" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1600,8 +1673,8 @@ msgstr "" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1650,13 +1723,13 @@ msgstr "" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgid "Repository" #~ msgstr "Repository" @@ -1676,16 +1749,16 @@ msgstr "" #~ msgstr "" #~ "Authentication keys\n" #~ "\n" -#~ "You can add and remove authentication keys in this dialogue. A key makes it " -#~ "possible to check verify the integrity of the software you download." +#~ "You can add and remove authentication keys in this dialogue. A key makes " +#~ "it possible to check verify the integrity of the software you download." #~ msgid "A_uthentication" #~ msgstr "A_uthentication" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " @@ -1710,11 +1783,11 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Restore the default keys shiped with the distribution. This will not change " -#~ "user-installed keys." +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user-installed keys." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Set _maximum size for the package cache" @@ -1747,11 +1820,13 @@ msgstr "" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "Changes not found, the server may not be updated yet." @@ -1760,11 +1835,11 @@ msgstr "" #~ msgstr "The updates are being applied." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Updating package list..." #~ msgstr "Updating package list..." @@ -1774,30 +1849,30 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgid "Never show this message again" #~ msgstr "Never show this message again" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Initializing and getting list of updates..." @@ -1829,10 +1904,10 @@ msgstr "" #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." \ No newline at end of file +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." diff --git a/po/en_GB.po b/po/en_GB.po index 9a759e33..e35595ad 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-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-06 04:33+0000\n" "Last-Translator: Jeff Bailes \n" "Language-Team: \n" @@ -54,6 +54,7 @@ msgstr "After one month" msgid "After %s days" msgstr "After %s days" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "%s updates" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Main server" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -119,8 +122,7 @@ msgid "Error removing the key" msgstr "Error removing the key" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -163,6 +165,7 @@ msgstr "Can't upgrade required meta-packages" 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:220 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" @@ -179,6 +182,7 @@ msgstr "" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" @@ -206,6 +210,7 @@ msgstr "" "It was impossible to install a required package. Please report this as a " "bug. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Can't guess meta-package" @@ -286,6 +291,7 @@ msgstr "" "here it will update all '%s' to '%s' entries.\n" "If you select 'no' the update will cancel." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Generate default sources?" @@ -356,6 +362,7 @@ msgstr "" "your Deleted Items folder and remove temporary packages of former " "installations using 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" @@ -432,6 +439,7 @@ msgstr "" "Some problem occurred during the clean-up. Please see the below message for " "more information. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Restoring original system state" @@ -442,6 +450,7 @@ msgid "Fetching backport of '%s'" msgstr "Fetching backport of '%s'" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -500,6 +509,7 @@ msgstr "Searching for obsolete software" msgid "System upgrade is complete." msgstr "System upgrade is complete." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -527,6 +537,7 @@ msgstr "Fetching file %li of %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Applying changes" @@ -544,6 +555,7 @@ msgstr "" "The upgrade aborts now. Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ in the bugreport." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -571,17 +583,18 @@ msgstr "A fatal error occured" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -626,8 +639,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Your system is up-to-date" @@ -675,6 +689,7 @@ msgid "%li seconds" msgstr "%li seconds" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -697,6 +712,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -806,6 +822,7 @@ msgstr "Could not download the release notes" msgid "Please check your internet connection." msgstr "Please check your Internet connection." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Could not run the upgrade tool" @@ -906,14 +923,17 @@ msgstr "" "Failed to download the list of changes. \n" "Please check your Internet connection." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Important security updates" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Recommended updates" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Proposed updates" @@ -926,71 +946,74 @@ msgstr "Backports" msgid "Distribution updates" msgstr "Distribution updates" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Other updates" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "Downloading list of changes..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Untick All" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Tick All" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Download size: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Checking for updates" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "From version %(old_version)s to %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Size: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Your distribution is not supported anymore" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -1000,16 +1023,17 @@ msgstr "" "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "New distribution release '%s' is available" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1019,19 +1043,23 @@ 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 "None" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1392,185 +1420,229 @@ msgstr "The window size" msgid "Configure the sources for installable software and updates" msgstr "Configure the sources for installable software and updates" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Community maintained" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Proprietary drivers for devices" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Restricted software" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom with Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "Canonical supported Open Source software" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Community maintained (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Community maintained Open Source software" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Non-free drivers" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Proprietary drivers for devices " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Restricted software (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "Software restricted by copyright or legal issues" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Backported updates" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officially supported" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "No longer officially supported" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Security Updates" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-compatible Software with Non-Free Dependencies" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Non-DFSG-compatible Software" @@ -1645,8 +1717,8 @@ msgstr "Non-DFSG-compatible Software" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1703,13 +1775,13 @@ msgstr "Non-DFSG-compatible Software" #~ msgstr "" #~ "Authentication keys\n" #~ "\n" -#~ "You can add and remove authentication keys in this dialogue. A key makes it " -#~ "possible to check verify the integrity of the software you download." +#~ "You can add and remove authentication keys in this dialogue. A key makes " +#~ "it possible to check verify the integrity of the software you download." #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " @@ -1741,11 +1813,11 @@ msgstr "Non-DFSG-compatible Software" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Restore the default keys shiped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user installed keys." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Set _maximum size for the package cache" @@ -1775,13 +1847,13 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgid "Cancel downloading the changelog" #~ msgstr "Cancel downloading the changelog" @@ -1857,7 +1929,8 @@ msgstr "Non-DFSG-compatible Software" #~ msgstr[1] "You have selected all %s updated packages, total size %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "You have selected %s out of %s updated package, size %s" #~ msgstr[1] "You have selected %s out of %s updated packages, total size %s" @@ -1865,11 +1938,11 @@ msgstr "Non-DFSG-compatible Software" #~ msgstr "The updates are being applied." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Updating package list..." #~ msgstr "Updating package list..." @@ -1882,19 +1955,19 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgid "Never show this message again" #~ msgstr "Never show this message again" @@ -1924,8 +1997,10 @@ msgstr "Non-DFSG-compatible Software" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." \ No newline at end of file +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." diff --git a/po/eo.po b/po/eo.po index 44c48522..5e05fe52 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-07-24 21:11+0000\n" "Last-Translator: Ed Glez \n" "Language-Team: Esperanto \n" @@ -55,6 +55,7 @@ msgstr "Post unu monato" msgid "After %s days" msgstr "Post %s tagoj" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "Eraro dum forigo de sxlosilo" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La sxlosilo elektita ne povis esti forigata. Bonvolu raporti cxi tion kiel " "cimon." @@ -160,6 +162,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -172,6 +175,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -196,6 +200,7 @@ msgstr "" "Estis neebla instalo de bezonata pakajxo. Bonvolu raporti cxi tion kiel " "cimo. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -255,6 +260,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -316,6 +322,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Cxu vi volas komenci la promociadon?" @@ -380,6 +387,7 @@ msgstr "" "Kelkaj problemoj okazis dum la purigado. Bonvolu vidi suban mesagxon por " "pliaj informoj. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -390,6 +398,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -440,6 +449,7 @@ msgstr "Sercxado de ne plu uzata programaro" msgid "System upgrade is complete." msgstr "Sistema promocio estas kompleta." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -467,6 +477,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Aplikado de sxangxoj" @@ -482,6 +493,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -505,13 +517,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -551,8 +564,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Via sistemo estas gxisdatigita" @@ -598,6 +612,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -617,6 +632,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -726,6 +742,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "Bonvolu kontroli vian interretan konekton." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Ne eblis ruli la promocian ilon" @@ -817,14 +834,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -837,106 +857,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versio %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Elsxuta grando: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Via distribuo ne estas plu subtenata" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Nova distribua eldono '%s' estas disponebla" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1262,184 +1290,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiale subtenata" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/es.po b/po/es.po index 8c271f45..84169464 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 21:00+0000\n" "Last-Translator: Ricardo Pérez López \n" "Language-Team: Spanish \n" @@ -57,6 +57,7 @@ msgstr "Después de un mes" msgid "After %s days" msgstr "Después de %s días" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -64,6 +65,7 @@ msgstr "Actualizaciones de %s" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -73,6 +75,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Servidor principal" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,8 +127,7 @@ msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -170,6 +172,7 @@ msgstr "No se han podido actualizar los meta-paquetes requeridos" 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:220 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" @@ -184,6 +187,7 @@ msgstr "" "Ha ocurrido un problema imposible de corregir cuando se calculaba la " "actualización. Por favor, informe de ésto como un fallo." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Error autenticando algunos paquetes" @@ -211,6 +215,7 @@ msgstr "" "No ha sido posible instalar un paquete requerido. Por favor, informe de ésto " "como un fallo. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "No se ha podido determinar el meta-paquete" @@ -293,6 +298,7 @@ msgstr "" "«Sí», se actualizarán todas las entradas «%s» a «%s».\n" "Si selecciona «No» se cancelará la actualización." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "¿Generar orígenes predeterminados?" @@ -333,9 +339,9 @@ msgid "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -"Se han desactivado algunas entradas de terceros proveedores en su " -"«sources.list». Puede volver a activarlas tras la actualización con la " -"herramienta «Propiedades del software», o con Synaptic." +"Se han desactivado algunas entradas de terceros proveedores en su «sources." +"list». Puede volver a activarlas tras la actualización con la herramienta " +"«Propiedades del software», o con Synaptic." #: ../DistUpgrade/DistUpgradeControler.py:358 msgid "Error during update" @@ -365,6 +371,7 @@ msgstr "" "espacio en disco en %s. Vacíe su papelera, y elimine los paquetes temporales " "de instalaciones anteriores tecleando «sudo apt-get clean» en una terminal." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "¿Desea comenzar la actualización?" @@ -443,6 +450,7 @@ msgstr "" "Ha ocurrido algún problema durante el limpiado. por favor, vea el mensaje " "inferior para más información. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Restaurando el estado original del sistema" @@ -453,6 +461,7 @@ msgid "Fetching backport of '%s'" msgstr "Descargando «backport» de '%s'" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -512,6 +521,7 @@ msgstr "Buscando paquetes obsoletos" msgid "System upgrade is complete." msgstr "La actualización del sistema se ha completado." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -539,6 +549,7 @@ msgstr "Descargando archivo %li de %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Aplicando los cambios" @@ -557,6 +568,7 @@ msgstr "" "fallo en el paquete «update-manager» e incluya en el informe de error los " "archivos contenidos en /var/log/dist-upgrade/." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -584,18 +596,19 @@ msgstr "Ha ocurrido un error fatal" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Por favor, informe de esto como un fallo e incluya los archivos " -"/var/log/dist-upgrade.log y /var/log/dist-upgrade-apt.log en su informe. La " +"Por favor, informe de esto como un fallo e incluya los archivos /var/log/" +"dist-upgrade.log y /var/log/dist-upgrade-apt.log en su informe. La " "actualización se cancelará ahora.\n" -"Su archivo «sources.list» original se ha guardado en " -"/etc/apt/sources.list.distUpgrade." +"Su archivo «sources.list» original se ha guardado en /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -642,8 +655,9 @@ msgstr "" "Para prevenir la pérdida de datos, cierre todas las aplicaciones y " "documentos." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Su sistema está actualizado" @@ -691,6 +705,7 @@ msgid "%li seconds" msgstr "%li segundos" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -714,6 +729,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -733,8 +749,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" -msgstr "" -"Reinicie el sistema para completar la actualización" +msgstr "Reinicie el sistema para completar la actualización" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -824,6 +839,7 @@ msgstr "No se han podido descargar las notas de publicación" msgid "Please check your internet connection." msgstr "Por favor, compruebe su conexión a Internet." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "No se ha podido ejecutar la herramienta de actualización" @@ -929,14 +945,17 @@ msgstr "" "Hubo un fallo al descargar la lista de cambios. \n" "Por favor, compruebe su conexión a Internet." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Actualizaciones importantes de seguridad" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Actualizaciones recomendadas" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Actualizaciones propuestas" @@ -949,90 +968,94 @@ msgstr "«Backports»" msgid "Distribution updates" msgstr "Actualizaciones de la distribución" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Otras actualizaciones" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "Descargando la lista de cambios..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Desmarcar todo" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Marcar todo" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Tamaño de descarga: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Por favor, espere; esto puede tardar un poco." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "La actualización se ha completado" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Comprobando actualizaciones" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la versión %(old_version)s a la %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Versión %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Su distribución ya no está soportada" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" "No podrá obtener nuevas correcciones de seguridad ni actualizaciones " -"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." +"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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Está disponible la nueva versión «%s» de la distribución" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "El índice de software está dañado" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1065,23 @@ 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 "Ninguno" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1079,8 +1106,7 @@ msgstr "Mantenga su sistema actualizado" #: ../data/glade/UpdateManager.glade.h:5 msgid "Not all updates can be installed" -msgstr "" -"No se han podido instalar todas las actualizaciones" +msgstr "No se han podido instalar todas las actualizaciones" #: ../data/glade/UpdateManager.glade.h:6 msgid "Starting update manager" @@ -1203,8 +1229,8 @@ msgstr "" "enviará de forma anónima al proyecto Ubuntu todas las semanas.\n" "\n" "Los resultados se usarán para mejorar el soporte de las aplicaciones " -"populares y para ordenar las aplicaciones en los resultados de las " -"búsquedas." +"populares y para ordenar las aplicaciones en los resultados de las búsquedas." +"" #: ../data/glade/SoftwareProperties.glade.h:9 msgid "Add Cdrom" @@ -1292,8 +1318,8 @@ msgid "" "\n" "You need a working internet connection to continue." msgstr "" -"La información acerca del software disponible está " -"obsoleta\n" +"La información acerca del software disponible está obsoleta\n" "\n" "Para poder instalar software y actualizaciones a partir de los orígenes que " "se hayan añadido o cambiado recientemente, es necesario recargar la " @@ -1422,185 +1448,229 @@ msgid "Configure the sources for installable software and updates" msgstr "" "Configura los orígenes para el software instalable y las actualizaciones" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 «Edgy Eft»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Mantenido por la comunidad" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Controladores privativos para dispositivos" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Software restringido" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS «Dapper Drake»" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "Software libre soportado por Canonical" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Mantenido por la comunidad (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Software libre mantenido por la comunidad" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Controladores no libres" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Controladores privativos para dispositivos " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Software restringido (multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "Software restringido por copyright o cuestiones legales" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM con Ubuntu 6.06 LTS «Dapper Drake»" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Actualizaciones «backport»" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualizaciones de Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "«Backports» de Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 «Hoary Hedgehog»" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Soportado oficialmente" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Actualizaciones de Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "«Backports» de Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 «Warty Warthog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantenido por la comunidad (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Software no libre (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Sin más soporte oficial" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restringido" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Actualizaciones de seguridad" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Actualizaciones de Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "«Backports» de Ubuntu 4.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 «Sarge»" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizaciones de seguridad de Debian 3.1 «Sarge»" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian «Etch» (pruebas)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian «Sid» (inestable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatible con la DFSG con dependencias no libres" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software no compatible con la DFSG" @@ -1608,7 +1678,6 @@ msgstr "Software no compatible con la DFSG" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "Software restringido por copyright o cuestiones legales" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Descargando archivo %li de %li a velocidad desconocida" @@ -1657,18 +1726,17 @@ msgstr "Software no compatible con la DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "Algunas actualizaciones requieren la desinstalación de software. Utilice la " -#~ "función «Marcar todas las actualizaciones» del gestor de paquetes " +#~ "Algunas actualizaciones requieren la desinstalación de software. Utilice " +#~ "la función «Marcar todas las actualizaciones» del gestor de paquetes " #~ "«Synaptic», o ejecute «sudo apt-get dist-upgrade» en una terminal, para " #~ "actualizar completamente su sistema." #~ msgid "The following updates will be skipped:" #~ msgstr "Se pasarán por alto las siguientes actualizaciones:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Faltan %li segundos" @@ -1691,13 +1759,14 @@ msgstr "Software no compatible con la DFSG" #~ msgid "Only one software management tool is allowed to run at the same time" #~ msgstr "" -#~ "Sólo se permite la ejecución simultánea de una única herramienta de gestión " -#~ "de software" +#~ "Sólo se permite la ejecución simultánea de una única herramienta de " +#~ "gestión de software" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." #~ msgstr "" -#~ "Por favor, cierre primero la otra aplicación (ej: «aptitude» o «Synaptic»)." +#~ "Por favor, cierre primero la otra aplicación (ej: «aptitude» o " +#~ "«Synaptic»)." #~ msgid "Channels" #~ msgstr "Canales" @@ -1747,8 +1816,8 @@ msgstr "Software no compatible con la DFSG" #~ msgstr "«Backports» de Ubuntu 6.06 LTS" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Cuando se exploraba la información de su repositorio, se encontró una " #~ "entrada no válida para la actualización.\n" @@ -1777,7 +1846,8 @@ msgstr "Software no compatible con la DFSG" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "Descargando informe de cambios\n" +#~ "Descargando informe de cambios\n" #~ "\n" #~ "Se necesita descargar los cambios del servidor central" @@ -1809,13 +1879,13 @@ msgstr "Software no compatible con la DFSG" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Actualizaciones disponibles\n" #~ "\n" -#~ "El gestor de actualizaciones encontró los siguientes paquetes actualizables. " -#~ "Puede actualizarlos usando el botón Instalar." +#~ "El gestor de actualizaciones encontró los siguientes paquetes " +#~ "actualizables. Puede actualizarlos usando el botón Instalar." #~ msgid "Repository" #~ msgstr "Repositorio" @@ -1835,19 +1905,20 @@ msgstr "Software no compatible con la DFSG" #~ msgstr "" #~ "Claves de autenticación\n" #~ "\n" -#~ "Puede añadir y quitar claves de autenticación desde este diálogo. Una clave " -#~ "hace posible verificar la integridad del software que descarga." +#~ "Puede añadir y quitar claves de autenticación desde este diálogo. Una " +#~ "clave hace posible verificar la integridad del software que descarga." #~ msgid "A_uthentication" #~ msgstr "A_utenticación" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Añadir un nuevo archivo de clave al anillo de confianza. Asegúrese de que " -#~ "obtuvo la clave a través de un canal seguro y que confía en el propietario. " +#~ "obtuvo la clave a través de un canal seguro y que confía en el " +#~ "propietario. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "Limpiar _temporalmente los archivos de paquetes" @@ -1869,8 +1940,8 @@ msgstr "Software no compatible con la DFSG" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Recupera las claves entregadas originalmente con la distribución. Esto no " #~ "cambia las claves instaladas por el usuario." @@ -1898,8 +1969,8 @@ msgstr "Software no compatible con la DFSG" #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" #~ "Ésto significa que no se satisfacen algunas dependencias de los paquetes " -#~ "instalados. Utilice la \"Actualización inteligente\" de synaptic o \"apt-get " -#~ "dist-upgrade\" para arreglar la situación." +#~ "instalados. Utilice la \"Actualización inteligente\" de synaptic o \"apt-" +#~ "get dist-upgrade\" para arreglar la situación." #~ msgid "It is not possible to upgrade all packages." #~ msgstr "No es posible actualizar todos los paquetes." @@ -1907,12 +1978,13 @@ msgstr "Software no compatible con la DFSG" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Ésto significa que además de la actualización de los paquetes será necesaria " -#~ "alguna acción adicional (como instalar o quitar paquetes). Utilice la " -#~ "\"Actualización inteligente\" de synaptic o \"apt-get dist-upgrade\" para " -#~ "arreglar la situación." +#~ "Ésto significa que además de la actualización de los paquetes será " +#~ "necesaria alguna acción adicional (como instalar o quitar paquetes). " +#~ "Utilice la \"Actualización inteligente\" de synaptic o \"apt-get dist-" +#~ "upgrade\" para arreglar la situación." #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" @@ -1923,11 +1995,11 @@ msgstr "Software no compatible con la DFSG" #~ msgstr "Se están aplicando las actualizaciones." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo tiempo. " -#~ "Cierre la otra aplicación primero." +#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo " +#~ "tiempo. Cierre la otra aplicación primero." #~ msgid "Updating package list..." #~ msgstr "Actualizando lista de paquetes..." @@ -1937,35 +2009,34 @@ msgstr "Software no compatible con la DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Actualícese a una nueva versión de Ubuntu Linux. La versión que está usando " -#~ "no obtendrá más actualizaciones de seguridad ni otras actualizaciones " -#~ "críticas. Visite http://www.ubuntulinux.org para información acerca de cómo " -#~ "actualizar." +#~ "Actualícese a una nueva versión de Ubuntu Linux. La versión que está " +#~ "usando no obtendrá más actualizaciones de seguridad ni otras " +#~ "actualizaciones críticas. Visite http://www.ubuntulinux.org para " +#~ "información acerca de cómo actualizar." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Hay una nueva versión de Ubuntu disponible" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Está disponible una nueva versión con el nombre '%s'. Visite " -#~ "http://www.ubuntulinux.org/ para recibir instrucciones acerca de cómo " -#~ "actualizar." +#~ "Está disponible una nueva versión con el nombre '%s'. Visite http://www." +#~ "ubuntulinux.org/ para recibir instrucciones acerca de cómo actualizar." #~ msgid "Never show this message again" #~ msgstr "No mostrar más este mensaje" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo tiempo. " -#~ "Cierre la otra aplicación primero." +#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo " +#~ "tiempo. Cierre la otra aplicación primero." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Inicializando y obteniendo lista de actualizaciones..." @@ -2000,10 +2071,10 @@ msgstr "Software no compatible con la DFSG" #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Actualizaciones disponibles\n" #~ "\n" -#~ "El gestor de actualizaciones encontró los siguientes paquetes actualizables. " -#~ "Puede actualizarlos usando el botón Instalar." \ No newline at end of file +#~ "El gestor de actualizaciones encontró los siguientes paquetes " +#~ "actualizables. Puede actualizarlos usando el botón Instalar." diff --git a/po/et.po b/po/et.po index bf5fdba9..42f76dd0 100644 --- a/po/et.po +++ b/po/et.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-06-10 17:42+0000\n" "Last-Translator: margus723 \n" "Language-Team: Estonian \n" @@ -55,6 +55,7 @@ msgstr "Peale ühte kuud" msgid "After %s days" msgstr "Peale %s päeva" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "Võtme eemaldamisel tekkis viga" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Valitud võtit pole võimalik eemaldada" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -150,8 +152,8 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" "Sinu süsteem sisaldab katkiseid pakette mida pole võimalik antud tarkvaraga " -"parandada. Palun paranda need kasutades rakendust \"synaptic\" või \"apt-" -"get\" enne jätkamist." +"parandada. Palun paranda need kasutades rakendust \"synaptic\" või \"apt-get" +"\" enne jätkamist." #: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" @@ -161,6 +163,7 @@ msgstr "Ei suuda uuendada nõutud metapakette" msgid "A essential package would have to be removed" msgstr "Hädavajalik pakett tuleks eemaldada" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Ei suuda uuendusi ette valmistada" @@ -173,6 +176,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Mõnede pakettide tuvastamisel tekkis viga." @@ -198,6 +202,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -257,6 +262,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -315,6 +321,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -377,6 +384,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -387,6 +395,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -437,6 +446,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -464,6 +474,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -479,6 +490,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -502,13 +514,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -548,8 +561,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -595,6 +609,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -614,6 +629,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -719,6 +735,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -808,14 +825,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -828,106 +848,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1249,184 +1277,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/eu.po b/po/eu.po index 7bb543cc..3b20b887 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-08-08 23:53+0000\n" "Last-Translator: Xabi Ezpeleta \n" "Language-Team: Basque \n" @@ -57,6 +57,7 @@ msgstr "HIlabete bat eta gero" msgid "After %s days" msgstr "%s egun eta gero" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -64,6 +65,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -73,6 +75,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -117,8 +120,7 @@ msgstr "Errore bat suertatu da aukeratutako fitxategiak inportatzerakoan" #: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." -msgstr "" -"Aukeratutako fitxategia ez da GPG giltza bat edo egoera txarrean dago." +msgstr "Aukeratutako fitxategia ez da GPG giltza bat edo egoera txarrean dago." #: ../SoftwareProperties/SoftwareProperties.py:992 #, fuzzy @@ -127,8 +129,7 @@ msgstr "Errorea giltza ezabatzerakoan" #: ../SoftwareProperties/SoftwareProperties.py:993 #, fuzzy -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Aukeratutako giltza ezin izan da ezabatu. Mesedez adierazi akatsa." #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -173,6 +174,7 @@ msgstr "Ezin izan dira berritu beharrezko meta-paketeak" msgid "A essential package would have to be removed" msgstr "Ezinbesteko pakete bat ezabatu beharko da" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -185,6 +187,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -209,6 +212,7 @@ msgstr "" "Ezin izan da beharrezko pakete bat instalatzea. Mesedez akats honen berri " "eman. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -268,6 +272,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -324,6 +329,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -386,6 +392,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -396,6 +403,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -446,6 +454,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -473,6 +482,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -488,6 +498,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -511,13 +522,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -557,8 +569,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -604,6 +617,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -623,6 +637,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -728,6 +743,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -817,14 +833,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -837,106 +856,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1258,184 +1285,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/fa.po b/po/fa.po index cb169548..89d56969 100644 --- a/po/fa.po +++ b/po/fa.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-06-08 13:47+0000\n" -"Last-Translator: Pedram Ganjeh Hadidi \n" +"Last-Translator: Pedram Ganjeh Hadidi \n" "Language-Team: Persian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,6 +56,7 @@ msgstr "" msgid "After %s days" msgstr "" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -159,6 +161,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -171,6 +174,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -193,6 +197,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -252,6 +257,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -308,6 +314,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -370,6 +377,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -380,6 +388,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -430,6 +439,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -457,6 +467,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -472,6 +483,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -495,13 +507,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -538,8 +551,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -585,6 +599,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -604,6 +619,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -709,6 +725,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -798,14 +815,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -818,105 +838,113 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1238,184 +1266,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/fi.po b/po/fi.po index ca9e5134..a4844337 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-06 07:42+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -54,6 +54,7 @@ msgstr "Kuukauden jälkeen" msgid "After %s days" msgstr "%s päivän jälkeen" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "%s päivitystä" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Pääpalvelin" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -166,6 +168,7 @@ msgstr "Tarvittavia metapaketteja ei voi päivittää" 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:220 msgid "Could not calculate the upgrade" msgstr "Tarvittavia päivitykseen liittyviä tarkistuksia ei voitu tehdä" @@ -183,6 +186,7 @@ msgstr "" "Ilmoita tästä ohjelmavirheestä paketille \"update-manager\" ja sisällytä " "tiedostot hakemistosta /var/log/dist-upgrade raporttiin." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Joitain paketteja varmennettaessa tapahtui virhe" @@ -209,6 +213,7 @@ msgid "" msgstr "" "Vaadittua pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Ei voitu arvata metapakettia" @@ -289,6 +294,7 @@ msgstr "" "\"Kyllä'\", kaikki \"%s\"-merkinnät muutetaan \"%s\"-merkinnöiksi.\n" "Jos valitset \"Ei\", päivitys keskeytyy." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Lisätäänkö oletusohjelmalähteet?" @@ -359,6 +365,7 @@ msgstr "" "roskakori ja poista väliaikaistiedostot aiemmista asennuksista käyttämällä " "komentoa 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Haluatko aloittaa päivityksen?" @@ -435,6 +442,7 @@ msgid "" msgstr "" "Siistimisvaiheessa ilmeni ongelma. Lisätietoja allaolevassa viestissä. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Palautetaan alkuperäistä järjestelmän tilaa" @@ -445,6 +453,7 @@ msgid "Fetching backport of '%s'" msgstr "Noudetaan paketin \"%s\" takaisinsovitusta" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -503,6 +512,7 @@ msgstr "Etsitään vanhentuneita ohjelmistoja" msgid "System upgrade is complete." msgstr "Järjestelmän päivitys on valmis." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -530,6 +540,7 @@ msgstr "Noudetaan tiedostoa %li/%li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Muutoksia toteutetaan" @@ -547,6 +558,7 @@ msgstr "" "Päivitys keskeytyy. Tee tästä virheraportti paketille \"update-manager\" ja " "sisällytä raporttiin tiedostot hakemistosta /var/log/dist-upgrade/." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -574,17 +586,18 @@ msgstr "Tapahtui vakava virhe" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot /var/log/dist-" "upgrade/main.log ja /var/log/dist-upgrade/apt.log. Päivitys keskeytyy nyt.\n" -"Alkuperäinen sources.list tallennettiin nimellä " -"/etc/apt/sources.list.distUpgrade." +"Alkuperäinen sources.list tallennettiin nimellä /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -630,8 +643,9 @@ msgid "To prevent data loss close all open applications and documents." msgstr "" "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Järjestelmäsi on ajan tasalla" @@ -677,13 +691,13 @@ msgid "%li seconds" msgstr "%li sekuntia" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " "with a 56k modem" -msgstr "" -"Nouto kestää noin %s 1Mbit-DSL-yhteydellä ja noin %s 56kbit-modeemilla" +msgstr "Nouto kestää noin %s 1Mbit-DSL-yhteydellä ja noin %s 56kbit-modeemilla" #: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" @@ -698,6 +712,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -718,8 +733,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" msgstr "" -"Käynnistä järjestelmä uudelleen saattaaksesi päivityksen " -"loppuun" +"Käynnistä järjestelmä uudelleen saattaaksesi päivityksen loppuun" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -809,6 +824,7 @@ msgstr "Ei voitu noutaa julkaisutietoja" msgid "Please check your internet connection." msgstr "Tarkista Internet-yhteytesi toimivuus." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Päivitystyökalua ei voitu suorittaa" @@ -911,14 +927,17 @@ msgstr "" "Muutosluettelon nouto epäonnistui. \n" "Tarkista Internet-yhteytesi toimivuus." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Tärkeät turvallisuuspäivitykset" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Suositellut päivitykset" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Ehdotetut päivitykset" @@ -931,71 +950,74 @@ msgstr "Takaisinsovitukset" msgid "Distribution updates" msgstr "Jakelupäivitykset" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Muut päivitykset" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versio %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "Noudetaan muutosluetteloa..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "Poista _valinnat" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Tarkista kaikki" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "%s täytyy noutaa" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Odota, tämä voi kestää jonkun aikaa." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Päivitys on valmis" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Tarkistetaan päivityksiä" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Versiosta %(old_version)s versioon %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Versio %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Koko: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Jakeluasi ei enää tueta" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1005,16 +1027,17 @@ msgstr "" "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja " "päivittämisestä osoitteesta http://www.ubuntu.com/" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Uusi jakelujulkaisu \"%s\" on saatavilla" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Ohjelmaluettelo on rikkinäinen" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1047,23 @@ msgstr "" "Synaptic-pakettienhallintaa tai komentoa \"sudo apt-get install -f\" " "päätteessä." +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 msgid "None" msgstr "Ei mitään" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 kB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f kB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1061,8 +1088,8 @@ msgstr "Pidä järjestelmäsi ajan tasalla" #: ../data/glade/UpdateManager.glade.h:5 msgid "Not all updates can be installed" msgstr "" -"Kaikkia päivityksiä ei voi asentaa \n" -" \n" +"Kaikkia päivityksiä ei voi asentaa\r\n" +"\r\n" "%s" #: ../data/glade/UpdateManager.glade.h:6 @@ -1310,8 +1337,8 @@ msgid "" msgstr "" "Kirjoita haluamasi ohjelmalähteen koko APT-rivi\n" "\n" -"APT-rivi sisältää kanavan tyypin, sijainnin ja sisällön, esimerkiksi " -"\"deb http://ftp.debian.org sarge main\"." +"APT-rivi sisältää kanavan tyypin, sijainnin ja sisällön, esimerkiksi " +"\"deb http://ftp.debian.org sarge main\"." #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1398,186 +1425,230 @@ msgstr "Ikkunan koko" msgid "Configure the sources for installable software and updates" msgstr "Muokkaa asennettavien ohjelmien ja päivitysten lähteitä" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Yhteisön ylläpitämät" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Suljetut laiteajurit" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Rajoitetut ohjelmistot" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\" -CD-levy" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "Canonicalin tukemat avoimen lähdekoodin ohjelmat" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Yhteisön ylläpitämät (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Yhteisön ylläpitämät avoimen lähdekoodin ohjelmistot" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Ei-vapaat ajurit" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Suljetut laiteajurit " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Rajoitetut ohjelmat (multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "Tekijänoikeus- tai lakiasioilla rajoitetut ohjelmistot" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\" -CD-levy" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Takaisinsovitetut päivitykset" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 päivitykset" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Virallisesti tuettu" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 päivitykset" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 takaisinsovitukset" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Yhteisön ylläpitämät (universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Ei enää virallisesti tuettu" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Rajoitettu tekijänoikeus" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 turvallisuuspäivitykset" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 päivitykset" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 takaisinsovitukset" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" turvallisuuspäivitykset" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testattava)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (epävakaa)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "DFSG-yhteensopivat ohjelmat joilla riippuvuuksia epävapaisiin ohjelmiin" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmat" @@ -1585,7 +1656,6 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "Tekijänoikeus- tai lakiasioilla käyttörajoitetut ohjelmistot" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella" @@ -1607,8 +1677,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Päivitetään jakeluun Ubuntu " -#~ "6.10" +#~ "Päivitetään jakeluun Ubuntu 6.10" #~ msgid "Important security updates of Ubuntu" #~ msgstr "Ubuntun tärkeät turvallisuuspäivitykset" @@ -1627,16 +1697,16 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "" #~ "Tarkistetaan järjestelmää\n" #~ "\n" -#~ "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia " -#~ "ominaisuuksia." +#~ "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat " +#~ "uusia ominaisuuksia." #~ msgid "Oficially supported" #~ msgstr "Virallisesti tuettu" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Jotkut päivitykset vaativat muiden ohjelmien poistoa. Käytä \"Merkitse " #~ "kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai " @@ -1645,7 +1715,6 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "The following updates will be skipped:" #~ msgstr "Seuraavat päivitykset ohitetaan:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Noin %li sekuntia jäljellä" @@ -1725,8 +1794,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "Ubuntu 6.06 LTS takaisinsovitukset" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Luettaessa varastotietoja ei löydetty kelvollisia ohjelmavarastoja " #~ "päivittämistä varten.\n" @@ -1768,11 +1837,12 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "Tiedosto '%s' ei sisällä sopivia ohjelmistokanavia." #~ msgid "" -#~ "You need to manually reload the latest information about " -#~ "updates\n" +#~ "You need to manually reload the latest information about updates\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" #~ "Sinun pitää ladata päivitystiedot uudelleen käsin\n" #~ "\n" @@ -1821,19 +1891,20 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "" #~ "Kirjoita haluamasi varaston koko APT-rivi\n" #~ "\n" -#~ "APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi " -#~ "\"deb http://ftp.debian.org sarge main\". Lisätietoja aiheesta löydät " +#~ "APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi " +#~ "\"deb http://ftp.debian.org sarge main\". Lisätietoja aiheesta löydät " #~ "dokumentaatiosta." #~ msgid "A_uthentication" #~ msgstr "Varmenn_us" #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että vastaanotit " -#~ "avaimen luotettavaa kanavaa pitkin, ja että luotat sen omistajaan. " +#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että " +#~ "vastaanotit avaimen luotettavaa kanavaa pitkin, ja että luotat sen " +#~ "omistajaan. " #~ msgid "Automatically check for software _updates." #~ msgstr "Tarkista ohjelma_päivitykset automaattisesti." @@ -1857,8 +1928,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "Maksimikoko megatavuissa:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Palauta jakelun mukana toimitetut oletusavaimet. Tämä ei muuta tai poista " #~ "itse asennettuja avaimia." @@ -1887,8 +1958,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Saatavilla olevat päivitykset\n" #~ "\n" @@ -1901,17 +1972,17 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "Reload the package information from the server. \n" #~ "\n" -#~ "If you have a permanent internet connection this is done automatically. If " -#~ "you are behind an internet connection that needs to be started by hand (e.g. " -#~ "a modem) you should use this button so that update-manager knows about new " -#~ "updates." +#~ "If you have a permanent internet connection this is done automatically. " +#~ "If you are behind an internet connection that needs to be started by hand " +#~ "(e.g. a modem) you should use this button so that update-manager knows " +#~ "about new updates." #~ msgstr "" #~ "Lataa pakettitiedot palvelimelta uudelleen. \n" #~ "\n" #~ "Jos sinulla on kiinteä Internet-yhteys, tämä tehdään automaattisesti. Jos " #~ "olet käsin muodostettavan Internet-yhteyden (esim. modeemi) takana, sinun " -#~ "täytyy käyttää tätä valintaa jotta päivitystenhallinta saisi tiedon uusista " -#~ "päivityksistä." +#~ "täytyy käyttää tätä valintaa jotta päivitystenhallinta saisi tiedon " +#~ "uusista päivityksistä." #~ msgid "Binary" #~ msgstr "Binääri" @@ -1937,8 +2008,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" -#~ "Jotkut asennettujen pakettien riippuvuuksista ovat siis täyttämättä. Käytä " -#~ "\"Synaptic\"- tai \"apt-get\"-ohjelmia korjataksesi ongelman." +#~ "Jotkut asennettujen pakettien riippuvuuksista ovat siis täyttämättä. " +#~ "Käytä \"Synaptic\"- tai \"apt-get\"-ohjelmia korjataksesi ongelman." #~ msgid "It is not possible to upgrade all packages." #~ msgstr "Kaikkia paketteja ei voida päivittää." @@ -1946,12 +2017,13 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Pakettien päivittämisen lisäksi tarvitaan siis joitain muita toimenpiteitä " -#~ "(kuten pakettien asentamista tai poistamista). Käytä Synaptic-ohjelman " -#~ "\"Smart Upgrade\"-toimintoa tai \"apt-get dist-upgrade\"-komentoa " -#~ "korjataksesi ongelman." +#~ "Pakettien päivittämisen lisäksi tarvitaan siis joitain muita " +#~ "toimenpiteitä (kuten pakettien asentamista tai poistamista). Käytä " +#~ "Synaptic-ohjelman \"Smart Upgrade\"-toimintoa tai \"apt-get dist-upgrade" +#~ "\"-komentoa korjataksesi ongelman." #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "Muutoksia ei löytynyt, palvelinta ei ole ehkä vielä päivitetty." @@ -1960,8 +2032,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "Päivityksiä asennetaan." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Voit hallita paketteja vain yhdellä ohjelmalla kerrallaan. Sulje toinen " #~ "ohjelma ensin." @@ -1974,19 +2046,20 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Päivitä uudempaan versioon Ubuntu Linuxista. Käyttämällesi versiolle ei enää " -#~ "ole tulossa turvallisuuspäivityksiä tai muita kriittisiä päivityksiä. " -#~ "Tietoja päivittämisestä löydät sivulta http://www.ubuntulinux.org." +#~ "Päivitä uudempaan versioon Ubuntu Linuxista. Käyttämällesi versiolle ei " +#~ "enää ole tulossa turvallisuuspäivityksiä tai muita kriittisiä " +#~ "päivityksiä. Tietoja päivittämisestä löydät sivulta http://www." +#~ "ubuntulinux.org." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Ubuntusta on uusi julkaisu saatavilla!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Uusi julkaisu nimeltään '%s' on saatavilla. Päivitysohjeet löydät " #~ "osoitteesta http://www.ubuntulinux.org/." @@ -1998,11 +2071,11 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "Ei saatu haluttua lukitusta" #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Tämä tarkoittaa yleensä, että toinen pakettienhallintaohjelma (kuten apt-get " -#~ "tai aptitude) on jo käynnissä. Sulje tämä toinen ohjelma ensin." +#~ "Tämä tarkoittaa yleensä, että toinen pakettienhallintaohjelma (kuten apt-" +#~ "get tai aptitude) on jo käynnissä. Sulje tämä toinen ohjelma ensin." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Alustetaan ja ladataan luetteloa päivityksistä..." @@ -2028,15 +2101,16 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että vastaanotit " -#~ "avaimen luotettua kanavaa pitkin ja että luotat avaimen omistajaan. " +#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että " +#~ "vastaanotit avaimen luotettua kanavaa pitkin ja että luotat avaimen " +#~ "omistajaan. " #~ msgid "" -#~ "Restore the default keys shiped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Palauta jakelun mukana toimitetut avaimet. Tämä ei tee muutoksia käyttäjän " -#~ "asentamiin avaimiin." +#~ "Palauta jakelun mukana toimitetut avaimet. Tämä ei tee muutoksia " +#~ "käyttäjän asentamiin avaimiin." #~ msgid "Ubuntu Update Manager" #~ msgstr "Ubuntun päivitysten hallinta" @@ -2044,8 +2118,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Saatavilla olevat päivitykset\n" #~ "\n" @@ -2053,4 +2127,4 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ "Asenna-painiketta." #~ msgid "0" -#~ msgstr "0" \ No newline at end of file +#~ msgstr "0" diff --git a/po/fr.po b/po/fr.po index 45fa5a82..8603e1f8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-06 17:26+0000\n" "Last-Translator: E.Malandain \n" "Language-Team: French \n" @@ -55,6 +55,7 @@ msgstr "Après un mois" msgid "After %s days" msgstr "Après %s jours" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "Mises à jour %s" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Serveur principal" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,8 +125,7 @@ msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -168,6 +170,7 @@ msgstr "Les meta-paquets désirés n'ont pu être mis à jour" 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:220 msgid "Could not calculate the upgrade" msgstr "Impossible de calculer la mise à jour" @@ -184,6 +187,7 @@ msgstr "" "Merci de rapporter ce bogue du paquet « update-manager » et d'inclure les " "fichiers de /var/log/dist-upgrade/ dans le rapport de bogue." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" @@ -211,6 +215,7 @@ msgstr "" "Il a été impossible d'installer un paquet pourtant requis. Merci de " "rapporter ce bogue. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" @@ -294,6 +299,7 @@ msgstr "" "cela mettra à jour toutes les entrées « %s » vers « %s ».\n" "Sinon, la mise à jour sera annulée." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Générer les sources par défaut ?" @@ -362,10 +368,11 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"Abandon de la mise à jour. Veuillez libérer au moins %s d'espace disque sur " -"%s. Videz la corbeille et supprimez les paquets temporaires des " -"installations effectuées en utilisant la commande « sudo apt-get clean »." +"Abandon de la mise à jour. Veuillez libérer au moins %s d'espace disque sur %" +"s. Videz la corbeille et supprimez les paquets temporaires des installations " +"effectuées en utilisant la commande « sudo apt-get clean »." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Voulez-vous commencer la mise à jour ?" @@ -444,6 +451,7 @@ msgstr "" "Un problème est survenu lors du nettoyage. Veuillez vous reporter au message " "ci-dessous pour plus d'informations. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Restaurer le système dans son état d'origine" @@ -454,6 +462,7 @@ msgid "Fetching backport of '%s'" msgstr "Recherche du backport (rétro-portage) de « %s »" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -512,6 +521,7 @@ msgstr "Recherche de logiciels obsolètes" msgid "System upgrade is complete." msgstr "La mise à jour du système est terminée." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -539,6 +549,7 @@ msgstr "Téléchargement du fichier %li sur %li en cours" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Application des changements" @@ -554,9 +565,10 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" "La mise à jour va être interrompue maintenant. Veuillez signaler ceci comme " -"un bogue du paquet « update-manager » et joindre les fichiers du répertoire " -"/var/log/dist-upgrade/ dans le rapport de bogue." +"un bogue du paquet « update-manager » et joindre les fichiers du répertoire /" +"var/log/dist-upgrade/ dans le rapport de bogue." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -584,18 +596,19 @@ msgstr "Une erreur fatale est survenue" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Veuillez signaler ce bogue et joindre les fichiers /var/log/dist-upgrade.log " "et /var/log/dist-upgrade/apt.log à votre rapport. La mise à jour est " "annulée.\n" -"Votre fichier sources.list d'origine a été enregistré dans " -"/etc/apt/sources.list.distUpgrade." +"Votre fichier sources.list d'origine a été enregistré dans /etc/apt/sources." +"list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -642,8 +655,9 @@ msgstr "" "Pour éviter toute perte de données accidentelle, veuillez fermer toutes les " "applications et documents ouverts." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Votre système est à jour" @@ -691,6 +705,7 @@ msgid "%li seconds" msgstr "%li secondes" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -714,6 +729,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -824,6 +840,7 @@ msgstr "Impossible de télécharger les informations de version" msgid "Please check your internet connection." msgstr "Veuillez vérifier votre connexion Internet." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Impossible de lancer l'outil de mise à jour" @@ -927,14 +944,17 @@ msgstr "" "Échec lors du téléchargement de la liste des modifications. \n" "Veuillez vérifier votre connexion Internet." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Mises à jour de sécurité" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Mises à jour recommandées" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Mises à jour suggérées" @@ -947,71 +967,74 @@ msgstr "« Backports »" msgid "Distribution updates" msgstr "Mises à jour de la distribution" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Autres mises à jour" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "Téléchargement de la liste des modifications…" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Tout décocher" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "Tout _vérifier" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Taille du téléchargement : %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Veuillez patienter, cela peut prendre du temps." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "La mise à jour est terminée" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Recherche des mises à jour disponibles en cours" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la version %(old_version)s vers la version %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Taille : %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Votre distribution n'est plus supportée" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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,16 +1044,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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Une nouvelle version « %s » est disponible" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "La liste des logiciels est corrompue" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1040,19 +1064,23 @@ 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 "Aucun(e)" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 Ko" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f Ko" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1065,8 +1093,8 @@ msgid "" "Your system does not check for updates automatically. You can configure this " "behavior in Software Sources on the Internet Updates tab." msgstr "" -"Vous devez vérifier manuellement la disponibilité de mises à " -"jour\n" +"Vous devez vérifier manuellement la disponibilité de mises à jour\n" "\n" "Votre système ne vérifie pas les mises à jour automatiquement. Vous pouvez " "configurer ce comportement dans Sources logicielles qui se trouve " @@ -1293,8 +1321,8 @@ msgid "" "\n" "You need a working internet connection to continue." msgstr "" -"Les informations sur les logiciels disponibles sont " -"obsolètes\n" +"Les informations sur les logiciels disponibles sont obsolètes\n" "\n" "Pour installer de nouveaux logiciels ou des mises à jour à partir des canaux " "logiciels modifiés ou nouvellement ajoutés, vous devez recharger ces " @@ -1424,187 +1452,231 @@ msgstr "" "Configurer les canaux logiciels (sources de mise à jour) et les mises à jour " "via Internet" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Maintenu par la communauté" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Pilotes propriétaires de périphériques" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Logiciel non libre" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM contenant Ubuntu 6.10 \"Edgy Eft\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "Logiciel libre supporté par Canonical" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Maintenu par la communauté (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Logiciel libre maintenu par la communauté" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Pilotes non libres" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Pilotes propriétaires de périphériques " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Logiciel non libre (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "Logiciel soumis au droit d'auteur ou à des restrictions légales" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM contenant Ubuntu 6.06 LTS \"Dapper Drake\"" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Mises à jour backportées" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM contenant Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Mises à jour pour Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "« Backports » pour Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM contenant Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Supporté officiellement" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Mises à jour pour Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "« Backports » pour Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Maintenu par la communauté (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non libre (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM contenant Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Support officiel terminé" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restreint" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Mises à jour pour Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "« Backports » pour Ubuntu 4.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Mises à jour de sécurité pour Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "Logiciel libre (selon les lignes directrices du projet Debian) dont les " "dépendances ne sont pas libres" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" @@ -1612,7 +1684,6 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "Logiciel restreint pour des raisons légales ou de copyright" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" @@ -1661,18 +1732,18 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Certaines mises à jour requièrent la suppression de logiciels " -#~ "supplémentaires. Utilisez la fonction « Sélectionner la totalité des mises à " -#~ "jour » du « Gestionnaire de paquets Synaptic » ou lancez « sudo apt-get dist-" -#~ "upgrade » dans un terminal pour mettre votre système complètement à jour." +#~ "supplémentaires. Utilisez la fonction « Sélectionner la totalité des " +#~ "mises à jour » du « Gestionnaire de paquets Synaptic » ou lancez « sudo " +#~ "apt-get dist-upgrade » dans un terminal pour mettre votre système " +#~ "complètement à jour." #~ msgid "The following updates will be skipped:" #~ msgstr "Les paquets suivants ne seront pas mis à jour :" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Environ %li secondes restantes" @@ -1748,11 +1819,11 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgstr "« Backports » pour Ubuntu 6.06 LTS" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" -#~ "Durant la vérification des informations du dépôt, aucune entrée valide pour " -#~ "la mise à jour n'a été trouvée.\n" +#~ "Durant la vérification des informations du dépôt, aucune entrée valide " +#~ "pour la mise à jour n'a été trouvée.\n" #~ msgid "Repositories changed" #~ msgstr "Les dépôts ont été modifiés" @@ -1761,8 +1832,8 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "Vous devez recharger la liste des paquets depuis les serveurs pour que vos " -#~ "changements soient effectifs. Voulez-vous le faire maintenant ?" +#~ "Vous devez recharger la liste des paquets depuis les serveurs pour que " +#~ "vos changements soient effectifs. Voulez-vous le faire maintenant ?" #~ msgid "Sections" #~ msgstr "Catégories :" @@ -1779,7 +1850,8 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "Téléchargement des changements\n" +#~ "Téléchargement des changements\n" #~ "\n" #~ "Il est nécessaire de récupérer les changement du serveur central" @@ -1811,13 +1883,13 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Mises à jour disponibles\n" #~ "\n" -#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à jour " -#~ "en utilisant le bouton Installer." +#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à " +#~ "jour en utilisant le bouton Installer." #~ msgid "Repository" #~ msgstr "Dépôt" @@ -1838,20 +1910,20 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ "Clés d'authentification\n" #~ "\n" #~ "Vous pouvez ajouter ou enlever des clés d'authentification grâce à cette " -#~ "boîte de dialogue. Une clé rend possible la vérification de l'intégrité des " -#~ "logiciels que vous téléchargez." +#~ "boîte de dialogue. Une clé rend possible la vérification de l'intégrité " +#~ "des logiciels que vous téléchargez." #~ msgid "A_uthentication" #~ msgstr "A_uthentification" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Ajouter une nouvelle clé au trousseau digne de confiance. Veuillez vérifier " -#~ "que vous avez obtenu la clé à travers un canal sécurisé et que vous faites " -#~ "confiance à son possesseur. " +#~ "Ajouter une nouvelle clé au trousseau digne de confiance. Veuillez " +#~ "vérifier que vous avez obtenu la clé à travers un canal sécurisé et que " +#~ "vous faites confiance à son possesseur. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "Nettoyer automatiquement les fichiers _temporaires des paquets" @@ -1873,8 +1945,8 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Restaurer les clés par défaut fournies avec la distribution. Les clés " #~ "installées par l'utilisateur ne seront pas modifiées." @@ -1911,23 +1983,25 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." -#~ msgstr "" -#~ "Cela signifie que d'autres actions (comme l'installation ou la suppression " -#~ "de paquets) seront requises après la mise à jour. Veuillez utiliser Synaptic " -#~ "« Mise à jour intelligente » ou « apt-get dist-upgrade » pour régler la " +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " #~ "situation." +#~ msgstr "" +#~ "Cela signifie que d'autres actions (comme l'installation ou la " +#~ "suppression de paquets) seront requises après la mise à jour. Veuillez " +#~ "utiliser Synaptic « Mise à jour intelligente » ou « apt-get dist-" +#~ "upgrade » pour régler la situation." #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" -#~ "Changements non trouvés, le serveur n'a peut-être pas encore été mis à jour." +#~ "Changements non trouvés, le serveur n'a peut-être pas encore été mis à " +#~ "jour." #~ msgid "The updates are being applied." #~ msgstr "Les mises à jour ont été appliquées." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Vous ne pouvez exécuter qu'un seul gestionnaire de paquets à la fois. " #~ "Veuillez tout d'abord fermer cette autre application." @@ -1940,20 +2014,20 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Veuillez mettre à jour vers une version plus récente d'Ubuntu Linux. La " -#~ "version que vous êtes entrain d'utiliser ne recevra pas d'autres correctifs " -#~ "de sécurité ou mises à jour critiques. Veuillez voir " -#~ "http://www.ubuntulinux.org pour les informations de mise à jour." +#~ "version que vous êtes entrain d'utiliser ne recevra pas d'autres " +#~ "correctifs de sécurité ou mises à jour critiques. Veuillez voir http://" +#~ "www.ubuntulinux.org pour les informations de mise à jour." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Il y a une nouvelle version d'Ubuntu disponible !" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Une nouvelle version avec le nom de code « %s » est disponible. Veuillez " #~ "voir http://www.ubuntulinux.org pour les informations de mise à jour." @@ -1963,8 +2037,8 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" #~ "Vous ne pouvez exécuter qu'un seul gestionnaire de paquets à la fois. " #~ "Veuillez tout d'abord fermer cette autre application." @@ -2001,13 +2075,13 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Mises à jour disponibles\n" #~ "\n" -#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à jour " -#~ "en utilisant le bouton Installer." +#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à " +#~ "jour en utilisant le bouton Installer." #~ msgid "0" -#~ msgstr "0" \ No newline at end of file +#~ msgstr "0" diff --git a/po/fur.po b/po/fur.po index b9e9da74..fbf9b393 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-08-25 05:55+0000\n" "Last-Translator: Marco \n" "Language-Team: Friulian \n" @@ -55,6 +55,7 @@ msgstr "Dopo un mèis" msgid "After %s days" msgstr "Dopo %s dîs" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -158,6 +160,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -170,6 +173,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -192,6 +196,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -251,6 +256,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -307,6 +313,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -369,6 +376,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -379,6 +387,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -429,6 +438,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -456,6 +466,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -471,6 +482,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -494,13 +506,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -540,8 +553,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -587,6 +601,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -606,6 +621,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -711,6 +727,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -800,14 +817,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -820,106 +840,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1241,184 +1269,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/gl.po b/po/gl.po index 3676102c..6e2f5b3b 100644 --- a/po/gl.po +++ b/po/gl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-09-25 21:24+0000\n" "Last-Translator: Xosé \n" "Language-Team: galician\n" @@ -57,6 +57,7 @@ msgstr "Logo dun mes" msgid "After %s days" msgstr "Logo de %s días" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -64,6 +65,7 @@ msgstr "actualizacións de %s" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -73,6 +75,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Servidor principal" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,8 +127,7 @@ msgid "Error removing the key" msgstr "Houbo un erro ao borrar a clave" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Non se pode borrar a clave que seleccionou. Por favor, avise disto como un " "fallo." @@ -170,6 +172,7 @@ msgstr "Non se puideron actualizar os meta-paquetes necesarios" msgid "A essential package would have to be removed" msgstr "Tívose que desinstalar un paquete esencial" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Non se puido calcular a actualización" @@ -186,6 +189,7 @@ msgstr "" "Informa deste erro do pacote \"update-manager\" e inclúe os ficheiros que " "hai en /var/log/dist-upgrade/ no informe." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Erro autenticando algúns paquetes" @@ -213,6 +217,7 @@ msgstr "" "Non foi posible instalar un paquete necesario. Por favor, informe disto como " "un fallo. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Non se puido determinar o meta-paquete" @@ -294,6 +299,7 @@ msgstr "" "selecciona «Si», actualizaranse todas as entradas '%s' a '%s'.\n" "Se selecciona «Non» cancelarase a actualización." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Xerar orixes predeterminadas?" @@ -306,8 +312,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Tras examinar o seu «sources.list», non se atoparon entradas válidas para " -"'%s'.\n" +"Tras examinar o seu «sources.list», non se atoparon entradas válidas para '%" +"s'.\n" "\n" "Deben engadirse entradas predeterminadas para '%s'? Se selecciona «Non» " "cancelarse a actualización." @@ -366,6 +372,7 @@ msgstr "" "espazo en disco en %s. Vacíe a súa papelera, e elimine os paquetes temporais " "de instalacións anteriores tecleando «sudo apt-get clean» nun terminal." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Desexa comezar a actualización?" @@ -385,8 +392,8 @@ msgstr "" "Vaise cancelar a actualización agora. O teu sistema podería ficar nun estado " "que non permita ser usado. Procedeuse a recuperalo (dpkg --configure -a).\n" "\n" -"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en " -"/var/log/dist-upgrade/ no informe." +"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en /" +"var/log/dist-upgrade/ no informe." #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -437,6 +444,7 @@ msgstr "" "Ocorreu algún problema durante o limpado. Por favor, vexa a mensaxe inferior " "para máis información. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "A retornar ao estado orixinal do sistema" @@ -447,6 +455,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -484,8 +493,8 @@ msgstr "" "esencial, xa non se dá atopado.\n" "Isto indica un erro serio.\n" "\n" -"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en " -"/var/log/dist-upgrade/ no informe." +"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en /" +"var/log/dist-upgrade/ no informe." #: ../DistUpgrade/DistUpgradeControler.py:733 msgid "Asking for confirmation" @@ -503,6 +512,7 @@ msgstr "Buscando paquetes obsoletos" msgid "System upgrade is complete." msgstr "Comletouse a actualización do sistema." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -530,6 +540,7 @@ msgstr "A baixar o ficheiro %li de %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Aplicando os cambios" @@ -547,6 +558,7 @@ msgstr "" "Vaise cancelar a actualización agora. Informa desde fallo do pacote \"update-" "manager\" e inclúe os ficheiros en /var/log/dist-upgrade/ no informe." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -572,18 +584,19 @@ msgstr "Ocorreu un erro fatal" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en " -"/var/log/dist-upgrade/ main.log e /var/log/dist-upgrade/apt.log no informe. " +"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en /" +"var/log/dist-upgrade/ main.log e /var/log/dist-upgrade/apt.log no informe. " "Vaise cancelar a actualización agora.\n" -"O teu ficheiro sources.list orixinal gardouse en " -"/etc/apt/sources.list.distUpgrade." +"O teu ficheiro sources.list orixinal gardouse en /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -626,11 +639,11 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." -msgstr "" -"Para previr a perda de datos peche todas as aplicacións e documentos." +msgstr "Para previr a perda de datos peche todas as aplicacións e documentos." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado" @@ -678,6 +691,7 @@ msgid "%li seconds" msgstr "%li segundos" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -698,6 +712,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -807,6 +822,7 @@ msgstr "Non se puideron descargar as notas da versión" msgid "Please check your internet connection." msgstr "Por favor, comprobe a súa conexión a Internet." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Non se puido executar a ferramenta de actualización" @@ -841,8 +857,7 @@ msgstr "Erro ao descargar" #: ../UpdateManager/DistUpgradeFetcher.py:209 msgid "Fetching the upgrade failed. There may be a network problem. " -msgstr "" -"Fallou a descarga da actualización. Pode haber un problema coa rede. " +msgstr "Fallou a descarga da actualización. Pode haber un problema coa rede. " #: ../UpdateManager/DistUpgradeFetcher.py:214 msgid "Failed to extract" @@ -906,14 +921,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Actualizacións de seguranza importantes" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Actualizacións recomendadas" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Actualizacións suxeridas" @@ -926,71 +944,74 @@ msgstr "Backports" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Outras actualizacións" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Quitarlle a Selección a Todo" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Seleccionalo Todo" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Tamaño de descarga: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Pode instalar %s actualización" msgstr[1] "Pode instalar %s actualizacións" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Por favor, espere; isto pode tardar un pouco." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Completouse a actualización" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "A examinar as actualizacións" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Versión %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "A súa distribución xa non está soportada" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -1000,16 +1021,17 @@ msgstr "" "críticas. Actualícese a unha versión posterior de Ubuntu Linux. Visite " "http://www.ubuntu.com para máis información sobre a actualización." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Está dispoñible a nova versión '%s' da distribución" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "O índice de software está danado" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1019,19 +1041,23 @@ msgstr "" "xestor de paquetes \"Synaptic\", ou execute \"sudo apt-get install -f\" nun " "terminal, para corrixir este problema primeiro." +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 msgid "None" msgstr "Nengún" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1389,190 +1415,233 @@ msgstr "O tamaño da ventá" msgid "Configure the sources for installable software and updates" msgstr "Configurar as fontes para programas e actualizacións instalábeis" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Mantido pola Comunidade" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Controladores propietarios de dispositivos" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Aplicacións restrinxidas" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom con Ubuntu 6.10 \"Edgy Eft\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Mantido pola Comunidade (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Software de Código Aberto mantido pola Comunidade" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Controladores non libres" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Controladores propietarios para dispositivos " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Software restrinxido (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom con Ubuntu 6.06 LTS \"Dapper Drake\"" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Actualizacións de backports" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizacións de Seguranza para Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualizacións para Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Backports de Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Soportado oficialmente" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizacións de Seguranza para Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Actualizacións para Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Backports para Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantido pola comunidade (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Software non libre (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Xa non se mantén oficialmente" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restrinxido" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizacións de Seguranza para Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Actualizacións para Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Backports para Ubuntu 4.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizacións de seguridade de Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (probas)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (inestable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatible coa DFSG con dependencias non libres" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software non compatible coa DFSG" -#, python-format #~ msgid "" #~ "Error scaning the CD\n" #~ "\n" @@ -1583,16 +1652,16 @@ msgstr "Software non compatible coa DFSG" #~ "%s" #~ msgid "" -#~ "A unresolvable problem occured while calculating the upgrade. Please report " -#~ "this as a bug. " +#~ "A unresolvable problem occured while calculating the upgrade. Please " +#~ "report this as a bug. " #~ msgstr "" #~ "Ocorreu un problema imposible de resolver cando se calculaba a " #~ "actualización. Por favor, informe disto como un fallo. " #~ 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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." #~ msgstr "" @@ -1612,11 +1681,12 @@ msgstr "Software non compatible coa DFSG" #~ "software», ou con Synaptic." #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "was run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery was run (dpkg --configure -a)." #~ msgstr "" -#~ "A actualización interromperase agora. O seu sistema pode quedar nun estado " -#~ "inutilizable. Estase levando a cabo unha recuperación (dpkg --configure -a)." +#~ "A actualización interromperase agora. O seu sistema pode quedar nun " +#~ "estado inutilizable. Estase levando a cabo unha recuperación (dpkg --" +#~ "configure -a)." #~ msgid "Some software no longer officially supported" #~ msgstr "Algúns programas xa non están soportados oficialmente" @@ -1637,40 +1707,33 @@ msgstr "Software non compatible coa DFSG" #~ msgid "Restoring originale system state" #~ msgstr "Restaurando o estado orixinal do sistema" -#, python-format #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore.\n" #~ "This indicates a serious error, please report this as a bug." #~ msgstr "" -#~ "Logo de actualizarse a información dos seus paquetes xa non é posible atopar " -#~ "o paquete esencial '%s».\n" +#~ "Logo de actualizarse a información dos seus paquetes xa non é posible " +#~ "atopar o paquete esencial '%s».\n" #~ "Isto indica un problema serio, por favor, informe disto como un fallo." -#, python-format #~ msgid "About %li days %li hours %li minutes remaining" #~ msgstr "Faltan %li dias %li horas %li minutos" -#, python-format #~ msgid "About %li hours %li minutes remaining" #~ msgstr "Faltan %li horas %li minutos" -#, python-format #~ msgid "About %li minutes remaining" #~ msgstr "Faltan %li minutos" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Faltan %li segundos" #~ msgid "Download is complete" #~ msgstr "Completouse a descarga" -#, python-format #~ msgid "Downloading file %li of %li at %s/s" #~ msgstr "Descargando ficheiro %li de %li a %s/s" -#, python-format #~ msgid "Downloading file %li of %li" #~ msgstr "Descargando ficheiro %li de %li" @@ -1678,7 +1741,6 @@ msgstr "Software non compatible coa DFSG" #~ msgstr "" #~ "A actualización cancelarase agora. Por favor, informe disto como un fallo." -#, python-format #~ msgid "" #~ "Replace configuration file\n" #~ "'%s'?" @@ -1687,43 +1749,41 @@ msgstr "Software non compatible coa DFSG" #~ "'%s'?" #~ msgid "" -#~ "Please report this as a bug and include the files /var/log/dist-upgrade.log " -#~ "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" +#~ "Please report this as a bug and include the files /var/log/dist-upgrade." +#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts " +#~ "now.\n" #~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." #~ msgstr "" #~ "Por favor, informe disto como un fallo e inclúa os arquivos /var/log/dist-" -#~ "upgrade.log e /var/log/dist-upgrade-apt.log no seu informe. A actualización " -#~ "cancelarase agora.\n" -#~ "O seu arquivo «sources.list» orixinal gardouse en " -#~ "/etc/apt/sources.list.distUpgrade." +#~ "upgrade.log e /var/log/dist-upgrade-apt.log no seu informe. A " +#~ "actualización cancelarase agora.\n" +#~ "O seu arquivo «sources.list» orixinal gardouse en /etc/apt/sources.list." +#~ "distUpgrade." -#, python-format #~ msgid "%s package is going to be removed." #~ msgid_plural "%s packages are going to be removed." #~ msgstr[0] "Vaise desinstalar %s paquete." #~ msgstr[1] "Vanse desinstalar %s paquetes." -#, python-format #~ msgid "%s new package is going to be installed." #~ msgid_plural "%s new packages are going to be installed." #~ msgstr[0] "Vaise instalar %s paquete novo." #~ msgstr[1] "Vanse instalar %s paquetes novos." -#, python-format #~ msgid "%s package is going to be upgraded." #~ msgid_plural "%s packages are going to be upgraded." #~ msgstr[0] "Vaise actualizar %s paquete." #~ msgstr[1] "Vanse actualizar %s paquetes." -#, python-format #~ msgid "You have to download a total of %s." #~ msgstr "Debe descargar un total de %s." #~ msgid "" -#~ "The upgrade can take several hours and cannot be canceled at any time later." +#~ "The upgrade can take several hours and cannot be canceled at any time " +#~ "later." #~ msgstr "" -#~ "A actualización pode levar varias horas e non poderá ser cancelada despois " -#~ "en ningún momento." +#~ "A actualización pode levar varias horas e non poderá ser cancelada " +#~ "despois en ningún momento." #~ msgid "Could not find any upgrades" #~ msgstr "Non se puido atopar ningunha actualización" @@ -1734,7 +1794,8 @@ msgstr "Software non compatible coa DFSG" #~ msgid "" #~ "Upgrading to Ubuntu 6.06 LTS" #~ msgstr "" -#~ "Actualizando a Ubuntu 6.06 LTS" +#~ "Actualizando a Ubuntu 6.06 LTS" #~ msgid "Downloading and installing the upgrades" #~ msgstr "Descargando e instalando as actualizacións" @@ -1743,44 +1804,42 @@ msgstr "Software non compatible coa DFSG" #~ msgstr "Actualizando Ubuntu" #~ msgid "" -#~ "Verfing the upgrade failed. There may be a problem with the network or with " -#~ "the server. " +#~ "Verfing the upgrade failed. There may be a problem with the network or " +#~ "with the server. " #~ msgstr "" -#~ "Fallou a verificación da actualización. Pode haber un problema coa rede ou o " -#~ "servidor. " +#~ "Fallou a verificación da actualización. Pode haber un problema coa rede " +#~ "ou o servidor. " -#, python-format #~ msgid "Downloading file %li of %li with %s/s" #~ msgstr "Descargando ficheiro %li de %li a %s/s" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Descargando ficheiro %li de %li a velocidade descoñecida" #~ msgid "The list of changes is not available yet. Please try again later." #~ msgstr "" -#~ "A lista de cambios non está dispoñible aínda. Por favor, ténteo de novo máis " -#~ "tarde." +#~ "A lista de cambios non está dispoñible aínda. Por favor, ténteo de novo " +#~ "máis tarde." #~ msgid "" #~ "Failed to download the list of changes. Please check your Internet " #~ "connection." #~ msgstr "" -#~ "Fallou a descarga da lista de cambios. Por favor, comprobe a súa conexión a " -#~ "Internet." +#~ "Fallou a descarga da lista de cambios. Por favor, comprobe a súa conexión " +#~ "a Internet." #~ msgid "Cannot install all available updates" #~ msgstr "Non se puideron instalar todas as actualizacións dispoñibles" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Algunhas actualizacións requiren a desinstalación de software. Utilice a " -#~ "función «Marcar todas as actualizacións» do xestor de paquetes «Synaptic», " -#~ "ou execute «sudo apt-get dist-upgrade» nun terminal, para actualizar " -#~ "completamente o seu sistema." +#~ "función «Marcar todas as actualizacións» do xestor de paquetes " +#~ "«Synaptic», ou execute «sudo apt-get dist-upgrade» nun terminal, para " +#~ "actualizar completamente o seu sistema." #~ msgid "The following updates will be skipped:" #~ msgstr "Pasaranse por alto as seguintes actualizacións:" @@ -1794,7 +1853,6 @@ msgstr "Software non compatible coa DFSG" #~ msgid "Show details" #~ msgstr "Mostrar detalles" -#, python-format #~ msgid "New version: %s (Size: %s)" #~ msgstr "Nova versión: %s (Tamaño: %s)" @@ -1804,19 +1862,21 @@ msgstr "Software non compatible coa DFSG" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." #~ msgstr "" -#~ "Por favor, peche primeiro a outra aplicación (ej: «aptitude» ou «Synaptic»)." +#~ "Por favor, peche primeiro a outra aplicación (ej: «aptitude» ou " +#~ "«Synaptic»)." #~ msgid "" #~ "You must check for updates manually\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" #~ "Debe comprobar as actualizacións manualmente\n" #~ "\n" -#~ "O seu sistema non comproba as actualizacións automatimente. Pode configurar " -#~ "este comportamento en \"Sistema\" -> \"Administración\" -> \"Propiedades do " -#~ "software\"." +#~ "O seu sistema non comproba as actualizacións automatimente. Pode " +#~ "configurar este comportamento en \"Sistema\" -> \"Administración\" -> " +#~ "\"Propiedades do software\"." #~ msgid "" #~ "Examining your system\n" @@ -1826,8 +1886,8 @@ msgstr "Software non compatible coa DFSG" #~ msgstr "" #~ "Analizando o seu sistema\n" #~ "\n" -#~ "As actualizacións de software corrixen erros, eliminan fallos de seguridade " -#~ "e proporcionan novas funcionalidades." +#~ "As actualizacións de software corrixen erros, eliminan fallos de " +#~ "seguridade e proporcionan novas funcionalidades." #~ msgid "Cancel _Download" #~ msgstr "Cancelar _descarga" @@ -1856,15 +1916,16 @@ msgstr "Software non compatible coa DFSG" #~ msgid "" #~ "The channel information is out-of-date\n" #~ "\n" -#~ "You have to reload the channel information to install software and updates " -#~ "from newly added or changed channels. \n" +#~ "You have to reload the channel information to install software and " +#~ "updates from newly added or changed channels. \n" #~ "\n" #~ "You need a working internet connection to continue." #~ msgstr "" #~ "A información das canles está obsoleta\n" #~ "\n" #~ "Debe recargar a información das canles para poder instalar software e " -#~ "actualizacións a partir das canles recientemente engadidas ou cambiadas. \n" +#~ "actualizacións a partir das canles recientemente engadidas ou " +#~ "cambiadas. \n" #~ "\n" #~ "Necesita unha conexión a internet para continuar." @@ -1875,17 +1936,17 @@ msgstr "Software non compatible coa DFSG" #~ msgstr "Compoñentes" #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." #~ msgstr "" -#~ "Introduza a liña de APT completa da canle que queira " -#~ "engadir\n" +#~ "Introduza a liña de APT completa da canle que queira engadir\n" #~ "\n" -#~ "A liña de APT contén o tipo, a ubicación e os compoñentes dunha canle, por " -#~ "exemplo \"deb http://ftp.debian.org sarge main\"." +#~ "A liña de APT contén o tipo, a ubicación e os compoñentes dunha canle, " +#~ "por exemplo \"deb http://ftp.debian.org sarge main\"." #~ msgid "Add Channel" #~ msgstr "Engadir unha canle" @@ -1903,12 +1964,12 @@ msgstr "Software non compatible coa DFSG" #~ msgid "" #~ "If automatic checking for updates is disabeld, you have to reload the " -#~ "channel list manually. This option allows to hide the reminder shown in this " -#~ "case." +#~ "channel list manually. This option allows to hide the reminder shown in " +#~ "this case." #~ msgstr "" -#~ "Se se desactiva a comprobación automática de actualizacións, debe recargar a " -#~ "lista de canles manualmente. Esta opción permítelle ocultar a notificación " -#~ "que se mostra neste caso." +#~ "Se se desactiva a comprobación automática de actualizacións, debe " +#~ "recargar a lista de canles manualmente. Esta opción permítelle ocultar a " +#~ "notificación que se mostra neste caso." #~ msgid "" #~ "Stores the state of the expander that contains the list of changs and the " @@ -1933,4 +1994,4 @@ msgstr "Software non compatible coa DFSG" #~ msgstr "Actualizacións de Ubuntu 6.06 LTS" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "«Backports» de Ubuntu 6.06 LTS" \ No newline at end of file +#~ msgstr "«Backports» de Ubuntu 6.06 LTS" diff --git a/po/he.po b/po/he.po index 50a7c398..3199ed27 100644 --- a/po/he.po +++ b/po/he.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-09-30 14:09+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: Hebrew \n" @@ -58,13 +58,15 @@ msgstr "אחרי חודש" msgid "After %s days" msgstr "אחרי %s ימים" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "מתקין עדכונים..." #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -74,6 +76,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "שרת ראשי" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,12 +127,11 @@ msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." #: ../SoftwareProperties/SoftwareProperties.py:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -167,6 +169,7 @@ msgstr "לא ניתן לשדרג את חבילות העל הנדרשות" msgid "A essential package would have to be removed" msgstr "חבילה חיונית תוסר בלית ברירה" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "לא ניתן לחשב את השדרוג" @@ -182,6 +185,7 @@ msgstr "" "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n" "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "שגיאה באימות חלק מן החבילות" @@ -204,6 +208,7 @@ msgid "" "bug. " msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "לא ניתן לקבוע חבילת על" @@ -278,6 +283,7 @@ msgstr "" "\n" "בחירה ב\"לא\" תבטל את העדכון." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "לייצר מקורות ברירת מחדל?" @@ -341,6 +347,7 @@ msgstr "" "השדרגו יתבטל כעת. יש לפנות לפחות %s מהשטח ב-%s. רוקנו את הזבל והסירו חבילות " "זמניות מהתקנות קודמות על ידי שימוש בפקודה \"sudo apt-get clean\"." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "האם ברצונך להתחיל את השדרוג?" @@ -404,6 +411,7 @@ msgid "" "more information. " msgstr "מספר בעיות נתגלו במהלך הניקוי. אנא הסתכל בהודעות מטה למידע נוסף. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 #, fuzzy msgid "Restoring original system state" @@ -415,6 +423,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -440,7 +449,7 @@ msgid "Invalid package information" msgstr "מידע חבילה לא תקין" #: ../DistUpgrade/DistUpgradeControler.py:721 -#, fuzzy +#, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore.\n" @@ -467,6 +476,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "שדרוג המערכת הושלם." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -478,23 +488,24 @@ msgid "Fetching is complete" msgstr "ההורדה הושלמה" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה." #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "נותרו %li דקות." #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "מוריד קובץ %li מתוך %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 #, fuzzy msgid "Applying changes" @@ -511,6 +522,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -534,29 +546,30 @@ msgstr "ארעה שגיאה חמורה" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "חבילה %s תשודרג." msgstr[1] "%s חבילות ישודרגו." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "חבילה חדשה %s תותקן." msgstr[1] "%s חבילות חדשות יותקנו." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "חבילה %s תשודרג." @@ -585,8 +598,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית או מסמך פתוחים." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "המערכת שלך מעודכנת" @@ -632,6 +646,7 @@ msgid "%li seconds" msgstr "%liשניות" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -651,6 +666,7 @@ msgstr "השדרוג הסתיים ונדרשת הפעלה מחדש. האם בר #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -760,6 +776,7 @@ msgstr "לא ניתן להוריד הערות שחרור גירסה." msgid "Please check your internet connection." msgstr "אנא בדקו את החיבור לאינטרנט." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "לא ניתן להריץ את כלי השדרוג" @@ -849,14 +866,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "עדכוני אבטחה חשובים" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "עדכונים מומלצים" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "עדכונים מוצעים" @@ -869,71 +889,74 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "עדכונים אחרים" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "גרסה %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "מוריד רשימת שינויים..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "גודל ההורדה: %s" -#: ../UpdateManager/UpdateManager.py:617 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:633 +#, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "מתקין עדכונים..." msgstr[1] "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "אנא חכו, התהליך לארוך זמן מה." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "העדכון הושלם" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "מחפש עדכונים" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "גרסה %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(גודל: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "גרסת ההפצה שלך אינה נתמכת יותר" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -942,16 +965,17 @@ msgstr "" "המערכת שלכם לא תקבל עדכוני אבטחה יותר. אנא שדרגו אותו לגירסה מאוחרת יותר של " "אובונטו לינוקס. ראו http://www.ubuntu.com למידע נוסף על שידרוג המערכת." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "גירסה חדשה של ההפצה, \"%s\", זמינה" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "אינדקס התוכנות פגום" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -960,19 +984,23 @@ 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" @@ -1230,8 +1258,8 @@ msgid "" msgstr "" "הכנס את שורת APT השלמה של המאגר שברצונך להוסיף\n" "\n" -"שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: \"deb " -"http://ftp.debian.org sarge main\"\n" +"שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: \"deb http://ftp.debian." +"org sarge main\"\n" "אפשר למצוא הסבר מפורט על זה בתיעוד." #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 @@ -1316,216 +1344,259 @@ msgstr "גודל החלון" msgid "Configure the sources for installable software and updates" msgstr "הגדרת מקורות התוכנות להתקנה והעדכונים" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "עדכונים - אובונטו 5.10" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "מתוחזק ע\"י הקהילה" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "דרייברים קניינים להתקנים" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "תוכנה שנתרמה" +#. Description #: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "מתוחזק ע\"י הקהילה (Universe(" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "תוכנות קוד פתוח המתוחזקות ע\"י הקהילה" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "לא-חופשי (Multiverse(" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "לא-חופשי (Multiverse(" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "עדכונים - אובונטו 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "עדכונים - אובונטו 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "נתמך רשמית" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "עדכונים - אובונטו 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "עדכונים - אובונטו 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "לא-חופשי (Multiverse(" +#. Description #: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "נתמך רשמית" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "זכויות יוצרים מגבילות" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "עדכונים - אובונטו 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "עדכונים - אובונטו 5.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "דביאן 3.1 \"סארג'\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "עדכוני אבטחה - דביאן יציב" +#. Description #: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "דביאן בדיקה" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "דביאן לא ארה\"ב (לא יציב)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" -#, python-format #~ msgid "" -#~ "This download will take about %s with a 56k modem and about %s with a 1Mbit " -#~ "DSL connection" +#~ "This download will take about %s with a 56k modem and about %s with a " +#~ "1Mbit DSL connection" #~ msgstr "ההורדה תיקח בערך %s עם מודם 56k ובערך %s עם חיבור DSL במהירות 1Mbit" #~ msgid "The list of changes is not available yet. Please try again later." @@ -1555,11 +1626,9 @@ msgstr "" #~ "אם אל אפשרת התקנת תוכנות המתחוזקות ע\"י הקהילה (universe), החבילות האלה " #~ "יסומנו להסרה בצעד הבא." -#, python-format #~ msgid "Downloading file %li of %li with %s/s" #~ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה" @@ -1572,13 +1641,14 @@ msgstr "" #~ msgid "" #~ "You must check for updates manually\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" #~ "יש לחפש עדכונים ידניתg>\n" #~ "\n" -#~ "המערכת שלך לא מחפשת עדכונים באופן אוטומטי. ניתן לשנות הגדרות אלו ב\"מערכת\"-" -#~ "> \"ניהול\" -> \"אפשרויות תוכנה\"." +#~ "המערכת שלך לא מחפשת עדכונים באופן אוטומטי. ניתן לשנות הגדרות אלו ב\"מערכת" +#~ "\"-> \"ניהול\" -> \"אפשרויות תוכנה\"." #~ msgid "Cancel _Download" #~ msgstr "בטל _הורדה" @@ -1604,7 +1674,6 @@ msgstr "" #~ msgid "Oficially supported" #~ msgstr "נתמך רשמית" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "נותרו %li שניות." @@ -1719,8 +1788,8 @@ msgstr "" #~ "תקינות התוכנה שאתה מוריד." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "הוסף קובץ מפתח חדש לרשימת המפתחות שאתה בוטח בהם. אנא וודא שאתה שקיבלת את " #~ "המפתח בדרך מאובטחת ושאתה בוטח בבעלים. " @@ -1750,8 +1819,8 @@ msgstr "" #~ msgstr "גודל מקסימלי במגה-בתים:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "שחזר את מפתחות ברירת המחדל שבאו עם ההפצה. זה לא ישנה את המפתחות המותקנים." @@ -1782,8 +1851,8 @@ msgstr "" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "עדכונים זמינים\n" #~ "\n" @@ -1855,7 +1924,8 @@ msgstr "" #~ msgstr[1] "בחרת את כל %s החבילות המעודכנות, בגודל כולל של %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "בחרת %s מתוך חבילה מעודכנת אחת, בגודל של %s" #~ msgstr[1] "בחרת %s מתוך %s חבילות מעודכנות, בגודל כולל של %s" @@ -1863,8 +1933,8 @@ msgstr "" #~ msgstr "העדכונים מתבצעים כרגע." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "אפשר להריץ רק מנהל חבילות אחד באותו זמן. אנא סגור מנהלי חבילות אחרים קודם." @@ -1879,16 +1949,16 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "אנא עדכן לגרסת אובונטו לינוקס חדשה. הגרסה שאתה משתמש בה כבר לא מקבלת עדכוני " -#~ "אבטחה או עדכונים קריטיים אחרים. אנא ראה http://www.ubuntulinux.org בשביל " -#~ "מידע אודות שדרוג." +#~ "אנא עדכן לגרסת אובונטו לינוקס חדשה. הגרסה שאתה משתמש בה כבר לא מקבלת " +#~ "עדכוני אבטחה או עדכונים קריטיים אחרים. אנא ראה http://www.ubuntulinux.org " +#~ "בשביל מידע אודות שדרוג." #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "הפצה חדשה עם שם קוד '%s' זמינה. אנא ראה http://www.ubuntulinux.org/ בשביל " #~ "הוראות שדרוג." @@ -1897,4 +1967,4 @@ msgstr "" #~ msgstr "אל תראה את הודעה זו שוב." #~ msgid "Changes not found, the server may not be updated yet." -#~ msgstr "שינויים לא נמצאו, השרת אולי לא מעודכן עדיין." \ No newline at end of file +#~ msgstr "שינויים לא נמצאו, השרת אולי לא מעודכן עדיין." diff --git a/po/hi.po b/po/hi.po index 6eea2d4a..a23f976b 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-08-01 15:30+0000\n" "Last-Translator: Gaurav Mishra \n" "Language-Team: Hindi \n" @@ -55,6 +55,7 @@ msgstr "एक महीने बाद" msgid "After %s days" msgstr "%s दिन बाद" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -158,6 +160,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -170,6 +173,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -192,6 +196,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -251,6 +256,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -307,6 +313,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -369,6 +376,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -379,6 +387,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -429,6 +438,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -456,6 +466,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -471,6 +482,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -494,13 +506,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -540,8 +553,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -587,6 +601,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -606,6 +621,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -711,6 +727,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -800,14 +817,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -820,106 +840,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1241,187 +1269,232 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #~ msgid " " -#~ msgstr " " \ No newline at end of file +#~ msgstr " " diff --git a/po/hr.po b/po/hr.po index fb78eb28..154fd296 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:38+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" @@ -56,6 +56,7 @@ msgstr "Nakon mjesec dana" msgid "After %s days" msgstr "Nakon %s dana" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "%s nadogradnje" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Glavni poslužitelj" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,13 +124,12 @@ msgid "Error removing the key" msgstr "Greška prilikom brisanja ključa" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -165,6 +167,7 @@ msgstr "Ne mogu nadograditi potrebne meta-pakete" 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:220 msgid "Could not calculate the upgrade" msgstr "Nisam mogao riješiti nadogradnju" @@ -180,6 +183,7 @@ msgstr "" "Neriješiv problem se pojavio prilikom rješavanja nadogradnje. Molimo " "prijavite ovo kao grešku." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Greška prilikom identificiranja nekih paketa" @@ -207,6 +211,7 @@ msgstr "" "Nije bilo moguće instalirati potreban paket. Molimo prijavite ovo kao " "grešku. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nisam mogao odrediti meta-paket" @@ -287,6 +292,7 @@ msgstr "" "odaberete 'Da' nadograditi će se svih '%s' do '%s' unosa.\n" "Ako odaberete 'ne' nadogradnja će se prekinuti." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Kreirati uobičajene izvore?" @@ -299,8 +305,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Nakon očitavanja vaše 'sources.list' datoteke nisam našao ispravan unos za " -"'%s'.\n" +"Nakon očitavanja vaše 'sources.list' datoteke nisam našao ispravan unos za '%" +"s'.\n" "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja će " "prekinuti." @@ -358,6 +364,7 @@ msgstr "" "Ispraznite smeće i uklonite privremene pakete od prošlih instalacija " "koristeći 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Želite li pokrenuti nadogradnju?" @@ -377,8 +384,8 @@ msgstr "" "Nadogradnja se prekida. Vaš sistem bi mogao biti u neupotrebljivom stanju. " "Obnavljanje je pokrenuto (dpkg --configure -a).\n" "\n" -"Molim, prijavite ovu grešku u 'update-manager' paketu i uključite datoteke u " -"/var/log/dist-upgrade/ direktoriju u prijavu." +"Molim, prijavite ovu grešku u 'update-manager' paketu i uključite datoteke " +"u /var/log/dist-upgrade/ direktoriju u prijavu." #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -435,6 +442,7 @@ msgstr "" "Neki problemi su se pojavili prilikom čišćenja. Molim pogledajte poruku za " "više informacija. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Vraćam u početno stanje" @@ -445,6 +453,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -504,6 +513,7 @@ msgstr "Tražim zastarjele programe" msgid "System upgrade is complete." msgstr "Nadogradnja sustava je završena." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -514,7 +524,7 @@ msgid "Fetching is complete" msgstr "Preuzimanje je završeno" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Preuzimam datoteku %li od %li pri %s/s" @@ -525,12 +535,13 @@ msgid "About %s remaining" msgstr "Otprilike je ostalo %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Preuzimam datoteku %li od %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Primjenjujem promjene" @@ -548,8 +559,9 @@ msgstr "" "Nadogradnja se prekida. Molim, prijavite ovu grešku za 'update-manager' " "paket i uključite u prijavu datoteke iz /var/log/dist-upgrade direktorija." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -573,20 +585,21 @@ msgstr "Pojavila se ozbiljna greška" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Molim, prijavite ovo kao bug i uključite datoteke /var/log/dist-" -"upgrade/main.log i /var/log/dist-upgrade-apt.log u vaše izvješće. " -"Nadogradnja se sada prekida.\n" -"Vaša originalna sources.list datoteka je spremljena u " -"/etc/apt/sources.list.distUpgrade." +"Molim, prijavite ovo kao bug i uključite datoteke /var/log/dist-upgrade/main." +"log i /var/log/dist-upgrade-apt.log u vaše izvješće. Nadogradnja se sada " +"prekida.\n" +"Vaša originalna sources.list datoteka je spremljena u /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket će biti uklonjen." @@ -594,7 +607,7 @@ msgstr[1] "%s paketa će biti uklonjena." msgstr[2] "%s paketa će biti uklonjeno." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s novi paket će biti instaliran." @@ -602,7 +615,7 @@ msgstr[1] "%s nova paketa će biti instalirana." msgstr[2] "%s novih paketa će biti instalirano." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket će biti nadograđen." @@ -610,7 +623,7 @@ msgstr[1] "%s paketa će biti nadograđena." msgstr[2] "%s paketa će biti nadograđeno." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -633,8 +646,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Vaš sustav sadrži posljednje nadogradnje" @@ -680,6 +694,7 @@ msgid "%li seconds" msgstr "%li sekundi" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -701,6 +716,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -721,8 +737,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" msgstr "" -"Ponovno pokretanje računala potrebno je za završetak " -"nadogradnje" +"Ponovno pokretanje računala potrebno je za završetak nadogradnje" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -815,6 +831,7 @@ msgstr "Nisam mogao dobaviti bilješke izdanja" msgid "Please check your internet connection." msgstr "Molim, provjerite vašu internet vezu." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Nisam mogao pokrenuti alat za nadogradnju" @@ -848,8 +865,7 @@ msgstr "Preuzimanje nije uspjelo" #: ../UpdateManager/DistUpgradeFetcher.py:209 msgid "Fetching the upgrade failed. There may be a network problem. " -msgstr "" -"Preuzimanje nadogradnje nije uspjelo. Vjerovatno je problem u mreži. " +msgstr "Preuzimanje nadogradnje nije uspjelo. Vjerovatno je problem u mreži. " #: ../UpdateManager/DistUpgradeFetcher.py:214 msgid "Failed to extract" @@ -889,12 +905,12 @@ msgstr "" "poslužiteljem. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Preuzimam datoteku %li od %li pri %s/s" @@ -919,14 +935,17 @@ msgstr "" "Preuzimanje popisa promjena nije uspjelo. Molim, provjerite svoju internet " "vezu." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Važne sigurnosne nadogradnje" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Preporučene nadogradnje" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Predložene nadogradnje" @@ -941,35 +960,37 @@ msgstr "Ubuntu 5.10 backporti" msgid "Distribution updates" msgstr "_Nastavi nadogradnju" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Druge nadogradnje" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Verzija %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Preuzimam popis promjena..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "Pro_vjeri" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Veličina preuzimanja: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -977,39 +998,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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "_Instaliraj nadogradnje" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Nova verzija: %s (Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Verzija %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Vaša distibucija više nije podržana" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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,16 +1041,17 @@ msgstr "" "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više " "detalja o nadogradnji." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Novo izdanje distribucije, '%s', je dostupno" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Popis programa je oštećen" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1038,19 +1061,23 @@ 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 "Ništa" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1324,8 +1351,8 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Unesite kompletnu APT liniju repozitorija koji želite " -"dodati\n" +"Unesite kompletnu APT liniju repozitorija koji želite dodati\n" "\n" "APT linija uključuje vstu, lokaciju i komponente kanala, na primjer \"deb " "http://ftp.debian.org sarge main\"." @@ -1416,192 +1443,235 @@ msgstr "Veličina prozora" msgid "Configure the sources for installable software and updates" msgstr "Podesi repozitorije i nadogradnje" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Održavani od strane zajednice" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Neslobodni upogonitelji za uređaje" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Neslobodni softver" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CDROM sa Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Održavani od strane zajednice (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Održavani od strane zajednice (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Softver održavan od strane zajednice" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Neslobodni pogonski programi" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Neslobodni upogonitelji za uređaje " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Ograničeni softver (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CDROM s Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Backport nadogradnje" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 osvježenja" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 backporti" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Službeno podržani" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 sigurnosne nadogradnje" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 nadogradnje" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 backporti" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Wart Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Održavani od strane zajednice (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Neslobodni (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Neki paketi više nisu službeno podržani" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Ograničeno autorsko pravo" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 sigurnosne nadogradnje" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 osvježenja" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" sigurnosne nadogradnje" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testni)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (nestabilni)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSG-nekompatibilni programi" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom" @@ -1652,8 +1722,8 @@ msgstr "DFSG-nekompatibilni programi" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Neke nadogradnje zahtijevaju uklanjanje pojedinih programa. Upotrijebite " #~ "opciju \"Označi sve nadogradnje\" upravitelja paketima \"Synaptic\" ili " @@ -1663,7 +1733,6 @@ msgstr "DFSG-nekompatibilni programi" #~ msgid "The following updates will be skipped:" #~ msgstr "Slijedeći paketi će biti preskočeni:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Otprilike je ostalo %li sekundi" @@ -1735,4 +1804,4 @@ msgstr "DFSG-nekompatibilni programi" #~ msgstr "Ubuntu 6.06 LTS osvježenja" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Ubuntu 6.06 LTS backporti" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS backporti" diff --git a/po/hu.po b/po/hu.po index e7f789c0..2e1c6b18 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-06 10:07+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -55,6 +55,7 @@ msgstr "Egy hónap után" msgid "After %s days" msgstr "%s nap után" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "%s frissítés" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Fő kiszolgáló" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,13 +123,12 @@ msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -165,6 +167,7 @@ msgstr "A szükséges meta-csomagok nem frissíthetőek" 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:220 msgid "Could not calculate the upgrade" msgstr "Nem tudom megtervezni a frissítés menetét" @@ -178,9 +181,10 @@ msgid "" msgstr "" "A frissítés megtervezése közben feloldhatatlan probléma lépett fel.\n" "\n" -"Jelentse ezt a hibát az \"update-manager\" csomaghoz és vegye be a " -"/var/log/dist-upgrade/ könyvtárban található fájlokat a hibajelentésbe." +"Jelentse ezt a hibát az \"update-manager\" csomaghoz és vegye be a /var/log/" +"dist-upgrade/ könyvtárban található fájlokat a hibajelentésbe." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" @@ -206,6 +210,7 @@ msgid "" "bug. " msgstr "Egy szükséges csomag nem telepíthető. Kérem, jelentse ezt hibaként. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nem tudom megállapítani a meta-csomagot" @@ -287,6 +292,7 @@ msgstr "" "frissítve. \n" "A \"Nem\" kiválasztása megszakítja a frissítést." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Alapértelmezett források ismételt előállítása?" @@ -354,10 +360,11 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"A frissítés most meg fog szakadni. Szabadítson fel legalább %s helyet a(z) " -"%s lemezen. Ürítse a kukáját és törölje a korábbi telepítések átmeneti " +"A frissítés most meg fog szakadni. Szabadítson fel legalább %s helyet a(z) %" +"s lemezen. Ürítse a kukáját és törölje a korábbi telepítések átmeneti " "fájljait a \"sudo apt-get clean\" parancs kiadásával." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Biztosan el szeretné kezdeni a frissítést?" @@ -377,8 +384,8 @@ 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).\n" "\n" -"Jelentse ezt a hibát az \"update-manager\" csomaghoz és vegye be a " -"/var/log/dist-upgrade/ könyvtárban található fájlokat a hibajelentésbe." +"Jelentse ezt a hibát az \"update-manager\" csomaghoz és vegye be a /var/log/" +"dist-upgrade/ könyvtárban található fájlokat a hibajelentésbe." #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -435,6 +442,7 @@ msgstr "" "A frissítés befejező fázisa közben hiba lépett fel. Az alábbi üzenet további " "információkat tartalmaz a hibára vonatkozóan. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "A rendszer eredeti állapotának helyreállítása" @@ -445,6 +453,7 @@ msgid "Fetching backport of '%s'" msgstr "\"%s\" visszaportolt változatának letöltése" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -504,6 +513,7 @@ msgstr "Elavult szoftverek keresése" msgid "System upgrade is complete." msgstr "A rendszer frissítése befejeződött." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -525,12 +535,13 @@ msgid "About %s remaining" msgstr "Kb. %s van hátra" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Fájl letöltése: %li/%li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Módosítások alkalmazása..." @@ -549,6 +560,7 @@ msgstr "" "csomaghoz és vegye be a /var/log/dist-upgrade/ könyvtárban található " "fájlokat a hibajelentésbe." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -576,9 +588,9 @@ msgstr "Végzetes hiba történt" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Jelentse ezt hibaként és a hibajelentéshez mellékelje a /var/log/dist-" @@ -588,6 +600,7 @@ msgstr "" "mentésre." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -607,7 +620,7 @@ msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d csomag frissítve lesz." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -631,8 +644,9 @@ msgstr "" "Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott " "alkalmazást és dokumentumot." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "A rendszere naprakész" @@ -680,6 +694,7 @@ msgid "%li seconds" msgstr "%li másodperc" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -703,6 +718,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -815,6 +831,7 @@ msgstr "A kiadási megjegyzések nem tölthetők le" msgid "Please check your internet connection." msgstr "Kérjük ellenőrizze az internetkapcsolatát." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Nem sikerült futtatni a frissítőeszközt" @@ -889,12 +906,12 @@ msgstr "" "kiszolgálóval. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp" @@ -918,14 +935,17 @@ msgstr "" "A módosítások listájának letöltése meghiúsult. Ellenőrizze az " "internetkapcsolatát." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Fontos biztonsági frissítések" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Ajánlott frissítések" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Javasolt frissítések" @@ -939,71 +959,74 @@ msgstr "Visszaportolt csomagok" msgid "Distribution updates" msgstr "Frissítés _folytatása" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Egyéb frissítések" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "%s verzió: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Módosítások listájának letöltése..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Kijelölések törlése" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "Összes _ellenőrzése" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Letöltés mérete: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Kis türelmet, ez eltarthat egy ideig." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "A frissítés befejeződött" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Frissítések keresése" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Új verzió: %s (Méret: %s)" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "%s verzió" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Méret: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "A terjesztés már nem támogatott" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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,16 +1036,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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "A disztribúció új \"%s\" kiadása elérhető" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "A szoftverindex sérült" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1056,23 @@ 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 "Nincs" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1058,8 +1086,8 @@ msgid "" "Your system does not check for updates automatically. You can configure this " "behavior in Software Sources on the Internet Updates tab." msgstr "" -"Önnek kézzel kell megkeresnie a rendelkezésre álló " -"frissítéseket\n" +"Önnek kézzel kell megkeresnie a rendelkezésre álló frissítéseket\n" "\n" "Az Ön rendszere jelenleg nem keresi automatikusan a frissítéseket. Ezt a " "viselkedést a \"Rendszer\" -> \"Adminisztráció\" -> \"Szoftverbeállítások\" " @@ -1072,8 +1100,8 @@ msgstr "Tartsa naprakészen a rendszerét" #: ../data/glade/UpdateManager.glade.h:5 msgid "Not all updates can be installed" msgstr "" -"Nem minden frissítés telepíthető \n" -" \n" +"Nem minden frissítés telepíthető\r\n" +"\r\n" "%s" #: ../data/glade/UpdateManager.glade.h:6 @@ -1286,8 +1314,8 @@ msgid "" "\n" "You need a working internet connection to continue." msgstr "" -"Az elérhető szoftverekkel kapcsolatos információk " -"elévültek\n" +"Az elérhető szoftverekkel kapcsolatos információk elévültek\n" "\n" "Szoftverek és frissítések telepítéséhez újonnan felvett vagy módosított " "forrásokból, újra le kell töltenie az elérhető szoftverekkel kapcsolatos " @@ -1323,11 +1351,11 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Adja meg a forrásként felvenni kívánt tároló teljes APT " -"sorát\n" +"Adja meg a forrásként felvenni kívánt tároló teljes APT sorát\n" "\n" -"Az APT sor tartalmazza a tároló típusát, helyét és összetevőit, például " -"\"deb http://ftp.debian.org sarge main\"." +"Az APT sor tartalmazza a tároló típusát, helyét és összetevőit, például " +"\"deb http://ftp.debian.org sarge main\"." #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1416,191 +1444,234 @@ msgstr "Az ablak mérete" msgid "Configure the sources for installable software and updates" msgstr "Telepíthető szoftverek és frissítések forrásának beállítása" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Közösségi karbantartású" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Szabadalmazott eszközmeghajtók" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Nem-szabad" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Az Ubuntu 6.10 \"Edgy Eft\" CD-ROM" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Közösségi karbantartású (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Közösségi karbantartású (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Közösségi karbantartású nyílt forrású szoftverek" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Nem-szabad meghajtók" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Szabadalmazott eszközmeghajtók " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Nem-szabad szoftverek (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "Szerzői vagy egyéb jogi problémák miatt korlátozott szoftver" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Az Ubuntu 6.06 LTS \"Dapper Drake\"-et tartalmazó CD-ROM" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Visszaportolt frissítések" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 frissítések" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Hivatalosan támogatott" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 biztonsági frissítések" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 frissítések" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 visszaportolt csomagok" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Közösségi karbantartású (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Nem-szabad (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Hivatalosan már nem támogatott" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Szerzői jogi korlátozás alatt" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 biztonsági frissítések" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 frissítések" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 visszaportolt csomagok" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" biztonsági frissítések" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (tesztelés alatt)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (instabil)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel" @@ -1651,8 +1722,8 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Néhány frissítés további szoftverek eltávolítását igényli. Használja a " #~ "Synaptic csomagkezelő \"Minden frissítés kijelölése\" funkcióját, vagy " @@ -1662,7 +1733,6 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgid "The following updates will be skipped:" #~ msgstr "A következő frissítések ki lesznek hagyva:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Kb. %li másodperc van hátra" @@ -1687,7 +1757,8 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." #~ msgstr "" -#~ "Zárja be a másik alkalmazást, például az aptitude vagy Synaptic programokat." +#~ "Zárja be a másik alkalmazást, például az aptitude vagy Synaptic " +#~ "programokat." #~ msgid "Channels" #~ msgstr "Csatornák" @@ -1733,4 +1804,4 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgstr "Ubuntu 6.06 LTS frissítések" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Ubuntu 6.06 LTS visszaportolt csomagok" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS visszaportolt csomagok" diff --git a/po/id.po b/po/id.po index 4cd6c8b7..210d7c10 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:38+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" @@ -54,13 +54,15 @@ msgstr "Setelah satu bulan" msgid "After %s days" msgstr "Setelah %s hari" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "_Instal Update" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,13 +124,12 @@ msgid "Error removing the key" msgstr "Kesalahan menghapus kunci" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -166,6 +168,7 @@ msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan" 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:220 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menghitung pemutakhiran" @@ -181,6 +184,7 @@ msgstr "" "Terjadi masalah saat menghitung pemutakhiran. Silakan laporkan ini sebagai " "bug." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Kesalahan membuktikan keabsahan beberapa paket" @@ -208,6 +212,7 @@ msgstr "" "Tidak memungkinkan untuk menginstal paket yang dibutuhkan. Silakan laporkan " "ini sebagai bug. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Tidak dapat menebak meta-paket" @@ -281,6 +286,7 @@ msgstr "" "pilih 'Yes' disini, berkas akan memutakhirkan semua entri '%s' ke '%s'.\n" "Jika anda pilih 'no' pemutakhiran akan dibatalkan." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Membuat sumber baku?" @@ -352,6 +358,7 @@ msgstr "" "cakram pada %s. Kosongkan sampah anda dan hapus paket sementara dari " "instalasi terdahulu dengan menggunakan 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Apakah anda ingin memulai pemutakhiran?" @@ -427,6 +434,7 @@ msgstr "" "Beberapa kesalahan terjadi pada waktu pembersihan. Silakan lihat pesan di " "bawah untuk informasi lebih lanjut. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Sistem dikembalikan ke keadaan awal" @@ -437,6 +445,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -466,7 +475,7 @@ msgid "Invalid package information" msgstr "Informasi paket tidak valid" #: ../DistUpgrade/DistUpgradeControler.py:721 -#, fuzzy +#, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore.\n" @@ -495,6 +504,7 @@ msgstr "Mencari perangkat lunak usang" msgid "System upgrade is complete." msgstr "Upgrade sistem telah selesai." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -506,23 +516,24 @@ msgid "Fetching is complete" msgstr "Pemutakhiran selesai" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Mengunduh berkas %li dari %li pada %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "Sekitar %li menit lagi" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Mengunduh berkas %li dari %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Sahkan perubahan" @@ -538,8 +549,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -564,37 +576,38 @@ msgstr "Terjadi kesalahan fatal" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Silakan laporkan ini sebagai bug dan sertakan berkas /var/log/dist-" -"upgrade.log dan /var/log/dist-upgrade-apt.log dalam laporan anda. Upgrade " -"akan dibatalkan sekarang. Berkas sources.list anda akan disimpan dalam " -"/etc/apt/sources.list.distUpgrade." +"Silakan laporkan ini sebagai bug dan sertakan berkas /var/log/dist-upgrade." +"log dan /var/log/dist-upgrade-apt.log dalam laporan anda. Upgrade akan " +"dibatalkan sekarang. Berkas sources.list anda akan disimpan dalam /etc/apt/" +"sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket akan dihapus." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s paket baru akan diinstal." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket akan diupgrade." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -618,8 +631,9 @@ msgid "To prevent data loss close all open applications and documents." msgstr "" "Untuk mencegah kehilangan data silakan tutup seluruh aplikasi dan dokumen." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Sistem anda telah up-to-date" @@ -645,12 +659,12 @@ msgid "Upgrade %s" msgstr "Upgrade %s" #: ../DistUpgrade/DistUpgradeView.py:27 -#, fuzzy +#, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Sekitar %li hari %li jam %li menit lagi" #: ../DistUpgrade/DistUpgradeView.py:29 -#, fuzzy +#, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Sekitar %li jam %li menit lagi" @@ -665,6 +679,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -686,6 +701,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -798,6 +814,7 @@ msgstr "Tidak dapat mengunduh catatan luncuran" msgid "Please check your internet connection." msgstr "Silakan periksa koneksi internet anda." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Tidak dapat menjalankan alat upgrade" @@ -870,12 +887,12 @@ msgstr "" "dengan server. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Mengunduh berkas %li dari %li dengan %s/s" @@ -900,15 +917,18 @@ msgstr "" "Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet " "anda." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Pemutakhiran lewat Internet" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -924,93 +944,97 @@ msgstr "Ubuntu 6.06 LTS Backports" msgid "Distribution updates" msgstr "_Lanjutkan Upgrade" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "_Instal Update" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versi %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Mengunduh senarai dari perubahan..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Periksa" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Ukuran unduh: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Pemutakhiran selesai" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "_Instal Update" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Versi baru: %s (Ukuran: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Versi %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Distribusi anda tidak disokong lagi" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" "Anda tidak akan mendapatkan perbaikan keamanan atau pemutakhiran penting " -"lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat " -"http://www.ubuntu.com untuk informasi lebih lanjut." +"lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www." +"ubuntu.com untuk informasi lebih lanjut." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Luncuran distribusi baru '%s' telah tersedia" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Indeks perangkat lunak telah rusak" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1020,19 +1044,23 @@ 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" @@ -1307,8 +1335,8 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Masukkan baris lengkap APT dari kanal yang ingin anda tambah " -"\n" +"Masukkan baris lengkap APT dari kanal yang ingin anda tambah \n" "\n" "Baris APT menyertakan tipe, lokasi dan komponen dari kanal, sebagai contoh " "\"deb http://ftp.debian.org sarge main\"." @@ -1401,210 +1429,253 @@ msgstr "Ukuran jendela" msgid "Configure the sources for installable software and updates" msgstr "Mengatur kanal perangkat lunak dan pemutakhiran lewat internet" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Dikelola oleh komunitas (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Tidak-bebas (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Updates" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Dikelola oleh komunitas (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Dikelola oleh komunitas (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Dikelola oleh komunitas (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Tidak-bebas (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Tidak-bebas (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 6.06 LTS Updates" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 6.06 LTS Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Resmi disokong" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 6.06 LTS Updates" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 6.06 LTS Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Dikelola oleh komunitas (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Tidak-bebas (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Hak cipta terlarang" +#. Description #: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 6.06 LTS Updates" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 6.06 LTS Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Security Updates" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "Perangkat Lunak yang sesuai dengan DFSG tapi tergantung pada Perangkat Lunak " "Tidak-Bebas" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui" @@ -1628,7 +1699,8 @@ msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Mengupgrade ke Ubuntu 6.06 LTS" +#~ "Mengupgrade ke Ubuntu 6.06 LTS" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1658,18 +1730,17 @@ msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Beberapa pemutakhiran butuh penghapusan perangkat lunak yang ada. Gunakan " #~ "fungsi \"Mark All Upgrades\" dari paket manajer paket \"Synaptic\" atau " -#~ "jalankan \"sudo apt-get dist-upgrade\"\" dalam terminal untuk memutakhirkan " -#~ "sistem anda." +#~ "jalankan \"sudo apt-get dist-upgrade\"\" dalam terminal untuk " +#~ "memutakhirkan sistem anda." #~ msgid "The following updates will be skipped:" #~ msgstr "Pemutakhiran berikut akan dilewati:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Sekitar %li detik lagi" @@ -1734,4 +1805,4 @@ msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" #~ msgstr "_Custom" #~ msgid "Ubuntu 6.06 LTS" -#~ msgstr "Ubuntu 6.06 LTS" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS" diff --git a/po/it.po b/po/it.po index 6f370bd5..90005ae0 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-06 12:46+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -56,6 +56,7 @@ msgstr "Dopo un mese" msgid "After %s days" msgstr "Dopo %s giorni" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "%s aggiornamenti" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Server principale" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -123,8 +126,7 @@ msgid "Error removing the key" msgstr "Errore nel rimuovere la chiave" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -158,8 +160,8 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" "Il sistema contiene pacchetti danneggiati che non possono essere aggiustati " -"con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-" -"get\" per risolvere il problema." +"con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get" +"\" per risolvere il problema." #: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" @@ -169,6 +171,7 @@ msgstr "Impossibile aggiornare i meta-pacchetti richiesti" 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:220 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'aggiornamento" @@ -186,6 +189,7 @@ msgstr "" "Notificare questo evento come bug riguardo il pacchetto «update-manager» e " "includere nella notifica i file della cartella «/var/log/dist-upgrade»." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Errore nell'autenticare alcuni pacchetti" @@ -213,6 +217,7 @@ msgstr "" "Non è stato possibile installare un pacchetto richiesto. Notificare questo " "evento come bug. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" @@ -294,6 +299,7 @@ msgstr "" "tutte le voci «%s» verranno aggiornate a «%s»\n" "Scegliendo «No» l'aggiornamento verrà annullato." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Generare le sorgenti predefinite?" @@ -334,9 +340,9 @@ msgid "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -"Sono state disabilitate alcune voci di terze parti nel proprio file " -"«sources.list». È possibile abilitarle di nuovo dopo l'aggiornamento con lo " -"strumento «software-properties» o con synaptic." +"Sono state disabilitate alcune voci di terze parti nel proprio file «sources." +"list». È possibile abilitarle di nuovo dopo l'aggiornamento con lo strumento " +"«software-properties» o con synaptic." #: ../DistUpgrade/DistUpgradeControler.py:358 msgid "Error during update" @@ -365,6 +371,7 @@ msgstr "" "il cestino e rimuovere i pacchetti temporanei di precedenti installazione " "usando \"sudo apt-get clean\"." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Iniziare l'aggiornamento?" @@ -385,8 +392,8 @@ msgstr "" "uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -" "a).\n" "\n" -"Riportare questo bug per il pacchetto 'update-manager' includendo i file in " -"/var/log/dist-upgrade/ nel rapporto." +"Riportare questo bug per il pacchetto 'update-manager' includendo i file in /" +"var/log/dist-upgrade/ nel rapporto." #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -443,6 +450,7 @@ msgstr "" "Si sono verificati alcuni problemi durante la pulizia. Leggere il messaggio " "seguente per maggiori informazioni. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Ripristino dello stato originale del sistema" @@ -453,6 +461,7 @@ msgid "Fetching backport of '%s'" msgstr "Recupero del backport di «%s»" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -469,8 +478,8 @@ msgid "" "upgrade/ in the bugreport." msgstr "" "La preparazione del sistema per l'aggiornamento è fallito. Notificare questo " -"evento come bug per il pacchetto «update-manager» includendo i file in " -"«/var/log/dist-upgrade/» nel rapporto." +"evento come bug per il pacchetto «update-manager» includendo i file in «/var/" +"log/dist-upgrade/» nel rapporto." #: ../DistUpgrade/DistUpgradeControler.py:695 msgid "Updating repository information" @@ -511,6 +520,7 @@ msgstr "Ricerca di software obsoleto" msgid "System upgrade is complete." msgstr "L'aggiornamento del sistema è stato completato." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -538,6 +548,7 @@ msgstr "Recupero del file %li di %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Applicazione dei cambiamenti" @@ -556,6 +567,7 @@ msgstr "" "'update-manager' e di includere i file in /var/log/dist-upgrade/ nella " "segnalazione." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -583,18 +595,19 @@ msgstr "Si è verificato un errore fatale" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Segnalare questo evento come un bug e includere nella notifica i file " -"/var/log/dist-upgrade/main.log e /var/log/dist-upgrade/apt.log. " -"L'aggiornamento viene interrotto.\n" -"Il file sources.list originale è stato salvato in " -"/etc/apt/sources.list.distUpgrade." +"Segnalare questo evento come un bug e includere nella notifica i file /var/" +"log/dist-upgrade/main.log e /var/log/dist-upgrade/apt.log. L'aggiornamento " +"viene interrotto.\n" +"Il file sources.list originale è stato salvato in /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -641,8 +654,9 @@ msgstr "" "Per prevenire la perdita di dati, chiudere tutte le applicazioni e i " "documenti aperti." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Il sistema è aggiornato" @@ -690,6 +704,7 @@ msgid "%li seconds" msgstr "%li secondi" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -711,6 +726,7 @@ msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -730,8 +746,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" -msgstr "" -"Riavviare il sistema per completare l'aggiornamento" +msgstr "Riavviare il sistema per completare l'aggiornamento" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -821,6 +836,7 @@ msgstr "Impossibile scaricare le note di rilascio" msgid "Please check your internet connection." msgstr "Controllare la propria connessione a internet." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Impossibile eseguire lo strumento di aggiornamento" @@ -926,14 +942,17 @@ msgstr "" "Fallito lo scaricamento dell'elenco dei cambiamenti. \n" "Verificare la connessione a Internet." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Aggiornamenti di sicurezza importanti" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Aggiornamenti raccomandati" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Aggiornamenti proposti" @@ -946,73 +965,76 @@ msgstr "Backport" msgid "Distribution updates" msgstr "Aggiornamenti della distribuzione" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Altri aggiornamenti" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versione %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "Scaricamento dell'elenco dei cambiamenti..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 #, fuzzy msgid "_Uncheck All" msgstr "_Decontrassegnare tutti" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Contrassengare tutti" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Dati da scaricare: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Attendere, l'operazione potrebbe richiedere del tempo." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "L'aggiornamento è stato completato" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Verifica degli aggiornamenti..." -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Dalla versione %(old_version)s alla %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Versione %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Dimensione: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "La distribuzione in uso non è più supportata" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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,16 +1044,17 @@ msgstr "" "versione più aggiornata di Ubuntu Linux. Per maggiori informazioni " "consultare http://www.ubuntu.com." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "È disponibile il nuovo rilascio «%s» della distribuzione" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "L'indice del software è danneggiato" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1064,23 @@ msgstr "" "dei pacchetti \"Synaptic\" o eseguire in un terminale \"sudo apt-get install " "-f\" per risolvere il problema." +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 msgid "None" msgstr "Niente" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 kB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f kB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1420,203 +1447,246 @@ msgid "Configure the sources for installable software and updates" msgstr "" "Configura le sorgenti per gli aggiornamenti e per il software installabile" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 «Edgy Eft»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Mantenuto dalla comunità" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Driver proprietari per i dispositivi" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Software con restrizioni" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS «Dapper Drake»" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "Software open source supportato da Canonical" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Mantenuto dalla comunità (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Software open source mantenuto dalla comunità" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Driver non liberi" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Driver proprietari per dispositivi " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Software con restrizioni (multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "Software con restrizioni per copyright o motivi legali" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM con Ubuntu 6.06 LTS «Drapper Drake»" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Aggiornamenti di backport" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Aggiornamenti per Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Backport per Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 «Hoary Hedgehog»" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Supportati ufficialmente" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Aggiornamenti per Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Backport per Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 «Warty Warthog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantenuti dalla comunità (universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non libero (multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Software non più supportato ufficialmente" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright con restrizioni" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Aggiornamenti per Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Backport per Ubuntu 4.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 «Sarge»" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Aggiornamenti di sicurezza per Debian 3.1 «Sarge»" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian «Etch» (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian «Sid» (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatibile con le DFSG con dipendenze non libere" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software non compatibile con le DFSG" #~ msgid "" -#~ "You will loose all customizations, that have been made by yourself or by a " -#~ "script, if you replace the file by its latest version." +#~ "You will loose all customizations, that have been made by yourself or by " +#~ "a script, if you replace the file by its latest version." #~ msgstr "" -#~ "Sostituendo il file con la sua versione più recente, andranno perse tutte le " -#~ "personalizzazioni apportate dall'utente o da uno script." +#~ "Sostituendo il file con la sua versione più recente, andranno perse tutte " +#~ "le personalizzazioni apportate dall'utente o da uno script." -#, python-format #~ msgid "" -#~ "This download will take about %s with a 56k modem and about %s with a 1Mbit " -#~ "DSL connection" +#~ "This download will take about %s with a 56k modem and about %s with a " +#~ "1Mbit DSL connection" #~ msgstr "" -#~ "Questo scaricamento richiederà circa %s con un modem 56k e circa %s con una " -#~ "connessione DSL da 1Mbit" +#~ "Questo scaricamento richiederà circa %s con un modem 56k e circa %s con " +#~ "una connessione DSL da 1Mbit" #~ msgid "The list of changes is not available yet. Please try again later." #~ msgstr "" @@ -1635,7 +1705,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "Software con restrizioni per copyright o questioni legali" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Scaricamento del file %li di %li a velocità sconosciuta" @@ -1684,18 +1753,17 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "Alcuni aggiornamenti richiedono la rimozione di altri programmi. Utilizzare " -#~ "la funzione \"Marca tutti gli aggiornamenti\" del gestore di pacchetti " -#~ "\"Synaptic\" o inserire il comando \"sudo apt-get dist-upgrade\" in un " -#~ "terminale per aggiornare completamente il sistema." +#~ "Alcuni aggiornamenti richiedono la rimozione di altri programmi. " +#~ "Utilizzare la funzione \"Marca tutti gli aggiornamenti\" del gestore di " +#~ "pacchetti \"Synaptic\" o inserire il comando \"sudo apt-get dist-upgrade" +#~ "\" in un terminale per aggiornare completamente il sistema." #~ msgid "The following updates will be skipped:" #~ msgstr "I seguenti aggiornamenti saranno tralasciati:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Circa %li secondi rimanenti" @@ -1704,7 +1772,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" -#~ "Interruzione immediata dell'aggiornamento. Notificare questo evento come bug." +#~ "Interruzione immediata dell'aggiornamento. Notificare questo evento come " +#~ "bug." #~ msgid "Upgrading Ubuntu" #~ msgstr "Aggiornamento di Ubuntu" @@ -1723,8 +1792,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." #~ msgstr "" -#~ "Chiudere tutte le altre applicazioni come \"aptitude\" o \"Synaptic\" prima " -#~ "di continuare." +#~ "Chiudere tutte le altre applicazioni come \"aptitude\" o \"Synaptic\" " +#~ "prima di continuare." #~ msgid "Channels" #~ msgstr "Canali" @@ -1777,27 +1846,27 @@ msgstr "Software non compatibile con le DFSG" #~ msgstr "Nessuna voce valida trovata" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" -#~ "Durante la scansione delle informazioni sui repository, non è stata trovata " -#~ "alcuna voce valida per l'aggiornamento.\n" +#~ "Durante la scansione delle informazioni sui repository, non è stata " +#~ "trovata alcuna voce valida per l'aggiornamento.\n" #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "is now run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery is now run (dpkg --configure -a)." #~ msgstr "" -#~ "Interruzione immediata dell'aggiornamento. Il sistema potrebbe essere in uno " -#~ "stato inutilizzabile. Verrà avviata una procedura di ripristino (dpkg --" -#~ "configure -a)." +#~ "Interruzione immediata dell'aggiornamento. Il sistema potrebbe essere in " +#~ "uno stato inutilizzabile. Verrà avviata una procedura di ripristino (dpkg " +#~ "--configure -a)." #~ msgid "" #~ "Please report this as a bug and include the files ~/dist-upgrade.log and " #~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. " #~ msgstr "" -#~ "Notificare questo evento come bug e includere nella notifica i file \"~/dist-" -#~ "upgrade.log\" e \"~/dist-upgrade-apt.log\". L'aggiornamento viene interrotto " -#~ "ora. " +#~ "Notificare questo evento come bug e includere nella notifica i file \"~/" +#~ "dist-upgrade.log\" e \"~/dist-upgrade-apt.log\". L'aggiornamento viene " +#~ "interrotto ora. " #~ msgid "You can install one update" #~ msgid_plural "You can install %s updates" @@ -1817,8 +1886,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "" #~ "Analysing your system\n" #~ "\n" -#~ "Software updates can correct errors, eliminate security vulnerabilities, and " -#~ "provide new features to you." +#~ "Software updates can correct errors, eliminate security vulnerabilities, " +#~ "and provide new features to you." #~ msgstr "" #~ "Analisi del sistema in uso\n" #~ "\n" @@ -1826,8 +1895,8 @@ msgstr "Software non compatibile con le DFSG" #~ "vulnerabilità di sicurezza e fornire nuove funzionalità." #~ msgid "" -#~ "Software updates can correct errors, eliminate security vulnerabilities, and " -#~ "provide new features to you." +#~ "Software updates can correct errors, eliminate security vulnerabilities, " +#~ "and provide new features to you." #~ msgstr "" #~ "Gli aggiornamenti software possono correggere errori, eliminare " #~ "vulnerabilità di sicurezza e fornire nuove funzionalità." @@ -1838,18 +1907,18 @@ msgstr "Software non compatibile con le DFSG" #~ "installed therefor" #~ msgstr "" #~ "L'installazione automatica è limitata ai soli aggiornamenti di sicurezza " -#~ "provenienti dai server Ubuntu ufficiali. Il pacchetto software \"unattended-" -#~ "upgrades\" deve perciò essere installato" +#~ "provenienti dai server Ubuntu ufficiali. Il pacchetto software " +#~ "\"unattended-upgrades\" deve perciò essere installato" #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line contains the type, location and sections of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." #~ msgstr "" -#~ "Inserire la riga APT completa del canale che si vuole " -#~ "aggiungere\n" +#~ "Inserire la riga APT completa del canale che si vuole aggiungere\n" #~ "\n" #~ "La riga APT contiene il tipo, la posizione e le sezioni di un canale, ad " #~ "esempio \"deb http://ftp.debian.org sarge main\"" @@ -1868,8 +1937,8 @@ msgstr "Software non compatibile con le DFSG" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "Download delle modifiche in " -#~ "corso\n" +#~ "Download delle modifiche in corso\n" #~ "\n" #~ "Devo scaricare le modifiche dal server centrale" @@ -1911,11 +1980,11 @@ msgstr "Software non compatibile con le DFSG" #~ "permette di verificare l'integrità del software che scarichi." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Aggiungi un nuovo file per una chiave nel portachiavi fidato. Assicurati di " -#~ "aver ricevuto la chiave attraverso un canale sicuro e di fidarti del " +#~ "Aggiungi un nuovo file per una chiave nel portachiavi fidato. Assicurati " +#~ "di aver ricevuto la chiave attraverso un canale sicuro e di fidarti del " #~ "proprietario. " #~ msgid "Add repository..." @@ -1943,8 +2012,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgstr "Dimensione massima in MB:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Ripristina le chiavi di default della distribuzione.\n" #~ "Questo non modificherà le chiavi installate dal'utente." @@ -1976,13 +2045,13 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Aggiornamenti Disponibili\n" #~ "\n" -#~ "I seguenti pacchetti possono essere aggiornati. Puoi aggiornarli usando il " -#~ "pulsante Installa." +#~ "I seguenti pacchetti possono essere aggiornati. Puoi aggiornarli usando " +#~ "il pulsante Installa." #~ msgid "Cancel downloading the changelog" #~ msgstr "Cancella il download delle modifiche" @@ -2017,7 +2086,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "Ubuntu CD Image Automatic Signing Key " #~ msgstr "" -#~ "Chiave di Firma Automatica per l'immagine CD di Ubuntu " +#~ "Chiave di Firma Automatica per l'immagine CD di Ubuntu " #~ msgid "Choose a key-file" #~ msgstr "Scegli un file di chiave" @@ -2042,7 +2112,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgstr[1] "" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Hai selezionato %s pacchetti su %s, dimensione %s" #~ msgstr[1] "" @@ -2050,8 +2121,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgstr "Gli aggiornamenti sono in fase di applicazione." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Puoi eseguire una sola applicazione di gestione dei pacchetti " #~ "contemporaneamente. Per favore prima chiudi quest'altra applicazione." @@ -2067,27 +2138,28 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Per favore aggiornati ad una nuova versione di Ubuntu Linux. La versione che " -#~ "stai usando non riceverà più aggiornamenti di sicurezza o altri " -#~ "aggiornamenti critici. Per favore guarda su http://www.ubuntulinux.org per " -#~ "informazioni riguardo all'aggiornamento." +#~ "Per favore aggiornati ad una nuova versione di Ubuntu Linux. La versione " +#~ "che stai usando non riceverà più aggiornamenti di sicurezza o altri " +#~ "aggiornamenti critici. Per favore guarda su http://www.ubuntulinux.org " +#~ "per informazioni riguardo all'aggiornamento." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "È disponibile una nuova release di Ubuntu!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Una nuova release con nome '%s' è disponbile. Per favore guarda su " -#~ "http://www.ubuntulinux.org/ per informazioni sull'aggiornamento" +#~ "Una nuova release con nome '%s' è disponbile. Per favore guarda su http://" +#~ "www.ubuntulinux.org/ per informazioni sull'aggiornamento" #~ msgid "Never show this message again" #~ msgstr "Non mostrare più questo messaggio" #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" -#~ "Modifiche non trovate, il server potrebbe non essere stato ancora aggiornato." \ No newline at end of file +#~ "Modifiche non trovate, il server potrebbe non essere stato ancora " +#~ "aggiornato." diff --git a/po/ja.po b/po/ja.po index 5fcdda7f..bbd32963 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:39+0000\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu Japanese Team \n" @@ -56,13 +56,15 @@ msgstr "1ヶ月後" msgid "After %s days" msgstr "%s 日後" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "アップデートをインストール中" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "メインサーバ" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -117,19 +120,19 @@ msgstr "選択したファイルのインポートエラー" #: ../SoftwareProperties/SoftwareProperties.py:980 msgid "The selected file may not be a GPG key file or it might be corrupt." -msgstr "選択したファイルはGPG鍵ファイルではないか、壊れている可能性があります。" +msgstr "" +"選択したファイルはGPG鍵ファイルではないか、壊れている可能性があります。" #: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "鍵削除のエラー" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択した鍵を削除できませんでした。バグとして報告してください。" #: ../SoftwareProperties/SoftwareProperties.py:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -156,7 +159,8 @@ msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -"システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれています。 Synaptic や apt-get を使って最初に修正してください。" +"システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま" +"す。 Synaptic や apt-get を使って最初に修正してください。" #: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" @@ -166,6 +170,7 @@ msgstr "要求されたメタパッケージがアップグレードできませ msgid "A essential package would have to be removed" msgstr "必須パッケージが削除されます" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "アップグレードが算定できません" @@ -179,6 +184,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "算定中に解決できない問題がおきました。バグとして報告してください。" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "いくつかのパッケージが認証されませんでした" @@ -189,9 +195,9 @@ msgid "" "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -"" -"いくつかのパッケージが認証できませんでした。これはおそらく一時的なネットワークの問題でしょう。あとで再び試してみてください。下に認証できなかったパッケージが" -"表示されます。" +"いくつかのパッケージが認証できませんでした。これはおそらく一時的なネットワー" +"クの問題でしょう。あとで再び試してみてください。下に認証できなかったパッケー" +"ジが表示されます。" #: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format @@ -202,8 +208,10 @@ msgstr "'%s' がインストールできません" msgid "" "It was impossible to install a required package. Please report this as a " "bug. " -msgstr "要求されたパッケージのインストールができません。バグとして報告してください。 " +msgstr "" +"要求されたパッケージのインストールができません。バグとして報告してください。 " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "メタパッケージを推測できません" @@ -217,9 +225,11 @@ msgid "" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -"システムに ubuntu-desktop, kubuntu-desktop ないし edubuntu-desktop パッケージ " -"が含まれていません。そして実行している ubuntu のバージョンが検出できません。 \n" -"開始前に Synaptic や apt-get を使用して上記のパッケージのうちのひとつをインストールしてください。" +"システムに ubuntu-desktop, kubuntu-desktop ないし edubuntu-desktop パッケー" +"ジ が含まれていません。そして実行している ubuntu のバージョンが検出できませ" +"ん。 \n" +"開始前に Synaptic や apt-get を使用して上記のパッケージのうちのひとつをインス" +"トールしてください。" #: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy @@ -267,11 +277,14 @@ msgid "" "here it will update all '%s' to '%s' entries.\n" "If you select 'no' the update will cancel." msgstr "" -"リポジトリ情報をスキャン中、アップグレードのためのミラーエントリが見つかりませんでした。内部ミラーないしミラー情報が古いと思われます。\n" +"リポジトリ情報をスキャン中、アップグレードのためのミラーエントリが見つかりま" +"せんでした。内部ミラーないしミラー情報が古いと思われます。\n" "\n" -"'sources.list' ファイルを書き換えますか？　'はい' を選択すると '%s' エントリを '%s' エントリにアップデートします。 " -"'いいえ' を選択するとアップデートをキャンセルします。" +"'sources.list' ファイルを書き換えますか？　'はい' を選択すると '%s' エントリ" +"を '%s' エントリにアップデートします。 'いいえ' を選択するとアップデートを" +"キャンセルします。" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "標準のソースを生成しますか？" @@ -286,7 +299,8 @@ msgid "" msgstr "" "'sources.list' をスキャン中、 '%s' の正しいエントリが見つかりませんでした。\n" "\n" -"'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートをキャンセルします。" +"'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートを" +"キャンセルします。" #: ../DistUpgrade/DistUpgradeControler.py:301 msgid "Repository information invalid" @@ -296,7 +310,9 @@ msgstr "リポジトリ情報が無効です" msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." -msgstr "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報告してください。" +msgstr "" +"リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報" +"告してください。" #: ../DistUpgrade/DistUpgradeControler.py:308 msgid "Third party sources disabled" @@ -309,8 +325,9 @@ msgid "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -"sources.list にある公式ではないエントリを無効にしました。再び有効にするには、アップグレード後に 'ソフトウェアのプロパティ' ツールか " -"Synaptic を使用してください。" +"sources.list にある公式ではないエントリを無効にしました。再び有効にするには、" +"アップグレード後に 'ソフトウェアのプロパティ' ツールか Synaptic を使用してく" +"ださい。" #: ../DistUpgrade/DistUpgradeControler.py:358 msgid "Error during update" @@ -320,7 +337,9 @@ msgstr "アップデート中にエラー発生" msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." -msgstr "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。ネットワーク接続をチェックし、再びアップデートしてください。" +msgstr "" +"アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。" +"ネットワーク接続をチェックし、再びアップデートしてください。" #: ../DistUpgrade/DistUpgradeControler.py:368 msgid "Not enough free disk space" @@ -333,9 +352,11 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"アップグレードを中断しました。少なくとも %s の空き容量を %s に用意してください。ごみ箱を空にし、'sudo apt-get clean' " -"コマンドを実行して以前インストールした一時パッケージを削除してください。" +"アップグレードを中断しました。少なくとも %s の空き容量を %s に用意してくださ" +"い。ごみ箱を空にし、'sudo apt-get clean' コマンドを実行して以前インストールし" +"た一時パッケージを削除してください。" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "アップグレードを開始しますか？" @@ -353,8 +374,8 @@ msgid "" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"アップグレードを中断しました。システムが使用できない状態になっている可能性があります。ただいま修正を実行中です (dpkg --configure -" -"a)。" +"アップグレードを中断しました。システムが使用できない状態になっている可能性が" +"あります。ただいま修正を実行中です (dpkg --configure -a)。" #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -364,7 +385,9 @@ msgstr "アップグレードをダウンロードできません" msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " -msgstr "アップグレードを中断しました。インターネット接続またはインストールメディア(CD-ROMなど)をチェックし。再試行してください。 " +msgstr "" +"アップグレードを中断しました。インターネット接続またはインストールメディア" +"(CD-ROMなど)をチェックし。再試行してください。 " #: ../DistUpgrade/DistUpgradeControler.py:516 msgid "Support for some applications ended" @@ -379,9 +402,11 @@ msgid "" "If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -"インストールされているこれらのパッケージは、もう公式にサポートされておらず、コミュニティサポートになっています('universe')。\n" +"インストールされているこれらのパッケージは、もう公式にサポートされておらず、" +"コミュニティサポートになっています('universe')。\n" "\n" -"'universe' を有効にしないと、これらのパッケージは次のステップで削除することを提案します。" +"'universe' を有効にしないと、これらのパッケージは次のステップで削除することを" +"提案します。" #: ../DistUpgrade/DistUpgradeControler.py:552 msgid "Remove obsolete packages?" @@ -403,8 +428,11 @@ msgstr "コミット中にエラー" msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " -msgstr "クリーンアップ中になんらかの問題が発生しました。下記の詳しいメッセージをご覧ください。 " +msgstr "" +"クリーンアップ中になんらかの問題が発生しました。下記の詳しいメッセージをご覧" +"ください。 " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "システムを元に戻し中" @@ -415,6 +443,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -442,7 +471,7 @@ msgid "Invalid package information" msgstr "無効なパッケージ情報" #: ../DistUpgrade/DistUpgradeControler.py:721 -#, fuzzy +#, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore.\n" @@ -469,6 +498,7 @@ msgstr "古いソフトウェアを検索する" msgid "System upgrade is complete." msgstr "システムのアップグレードが完了しました。" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -480,23 +510,24 @@ msgid "Fetching is complete" msgstr "アップデートが完了しました" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "およそ残り %li 分" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "%i のうち %i をダウンロード中" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "変更を適用中" @@ -512,8 +543,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -538,36 +570,38 @@ msgstr "重大なエラーが発生しました" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"~/dist-upgrade.log と ~/dist-upgrade-apt.log " -"を含めて不具合として報告してください。アップグレードは中断しました。\n" -"元の sources.list は /etc/apt/sources.list.distUpgrade として保存されています。" +"~/dist-upgrade.log と ~/dist-upgrade-apt.log を含めて不具合として報告してくだ" +"さい。アップグレードは中断しました。\n" +"元の sources.list は /etc/apt/sources.list.distUpgrade として保存されていま" +"す。" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%s つのパッケージが削除されます。" #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s·つのパッケージがインストールされます。" #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s·つのパッケージがアップグレードされます。" #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -586,10 +620,13 @@ msgstr "アップグレードには数時間かかり、今後一切キャンセ #: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." -msgstr "データの損失を避けるため、すべてのアプリケーションとドキュメントを閉じてください。" +msgstr "" +"データの損失を避けるため、すべてのアプリケーションとドキュメントを閉じてくだ" +"さい。" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "システムは最新の状態です!" @@ -615,12 +652,12 @@ msgid "Upgrade %s" msgstr "アップグレード %s" #: ../DistUpgrade/DistUpgradeView.py:27 -#, fuzzy +#, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "およそ残り %li 日 %li 時間 %li 分" #: ../DistUpgrade/DistUpgradeView.py:29 -#, fuzzy +#, fuzzy, python-format msgid "%li hours %li minutes" msgstr "およそ残り %li 時間 %li 分" @@ -635,6 +672,7 @@ msgid "%li seconds" msgstr "%li 秒" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -654,6 +692,7 @@ msgstr "アップグレードが終了しました。再起動が必要ですが #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -668,11 +707,13 @@ msgid "" msgstr "" "アップグレードをキャンセルしますか？\n" "\n" -"アップグレードをキャンセルすると、おそらくシステムは不安定な状態になります。アップグレードを再開することを強くおすすめします。" +"アップグレードをキャンセルすると、おそらくシステムは不安定な状態になります。" +"アップグレードを再開することを強くおすすめします。" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" -msgstr "アップグレードを完了するためにシステムの再起動が必要です" +msgstr "" +"アップグレードを完了するためにシステムの再起動が必要です" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -765,6 +806,7 @@ msgstr "リリースノートををダウンロードできません" msgid "Please check your internet connection." msgstr "インターネット接続を確認してください。" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "アップグレードツールを実行できません" @@ -806,7 +848,9 @@ msgstr "抽出に失敗しました" msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " -msgstr "アップグレードの抽出に失敗しました。おそらくネットワークまたはサーバの問題です。 " +msgstr "" +"アップグレードの抽出に失敗しました。おそらくネットワークまたはサーバの問題で" +"す。 " #: ../UpdateManager/DistUpgradeFetcher.py:221 msgid "Verfication failed" @@ -817,7 +861,9 @@ msgstr "検証に失敗しました" msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " -msgstr "アップグレードの検証に失敗しました。おそらくネットワークまたはサーバの問題です。 " +msgstr "" +"アップグレードの検証に失敗しました。おそらくネットワークまたはサーバの問題で" +"す。 " #: ../UpdateManager/DistUpgradeFetcher.py:228 msgid "Authentication failed" @@ -827,15 +873,17 @@ msgstr "認証に失敗しました" msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " -msgstr "アップグレードの認証に失敗しました。おそらくネットワークまたはサーバの問題です。 " +msgstr "" +"アップグレードの認証に失敗しました。おそらくネットワークまたはサーバの問題で" +"す。 " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" #: ../UpdateManager/GtkProgress.py:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" @@ -856,17 +904,22 @@ msgstr "変更点がまだ取得できません。あとで試してください msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." -msgstr "変更点の取得に失敗しました。インターネットに接続されているか確認してください。" +msgstr "" +"変更点の取得に失敗しました。インターネットに接続されているか確認してくださ" +"い。" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 セキュリティアップデート" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -882,113 +935,123 @@ msgstr "Ubuntu 6.04 バックポート" msgid "Distribution updates" msgstr "アップグレードを再開する(_R)" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "アップデートをインストール中" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "バージョン %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "変更点を取得中..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "すべてのチェックをはずす(_U)" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "チェック(_C)" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "ダウンロードサイズ: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 個のアップデートがインストールされます" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "しばらくお待ちください。少々時間がかかります。" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "アップデートが完了しました" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "インストールできるアップデートをチェック" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "新しいバージョン: %s (サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "バージョン %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "このディストリビューションはすでにサポート対象外です" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" -"セキュリティフィックスやアップデートはもう提供されません。最新バージョンの Ubuntu Linux にアップグレードしてください。 \n" +"セキュリティフィックスやアップデートはもう提供されません。最新バージョンの " +"Ubuntu Linux にアップグレードしてください。\r\n" "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "新しいディストリビューション '%s' にアップグレードできます" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "ソフトウェアのインデックスが壊れています" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 "" -"何らかのソフトウェアがインストールないし削除できません。 \"Synaptic\" パッケージマネージャを使用するか、 まずこの問題を解決するために " -"\"sudo apt-get install -f\" コマンドをターミナルで実行してください。" +"何らかのソフトウェアがインストールないし削除できません。 \"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 "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1004,8 +1067,9 @@ msgid "" msgstr "" "アップデートの情報を手動でチェックしてください\n" "\n" -"システムはアップデートを自動的にチェックしません。この設定の変更は·\"システム(System)\"·->·\"システム管理\"·-" -">·\"ソフトウェアのプロパティ (Software Properties)\" で行います。" +"システムはアップデートを自動的にチェックしません。この設定の変更は·\"システム" +"(System)\"·->·\"システム管理\"·->·\"ソフトウェアのプロパティ (Software " +"Properties)\" で行います。" #: ../data/glade/UpdateManager.glade.h:4 msgid "Keep your system up-to-date" @@ -1068,7 +1132,9 @@ msgstr "ソフトウェアのアップデート" msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." -msgstr "ソフトウェアアップデートはエラーを訂正し、セキュリティホールを修正し、新機能を提供します。" +msgstr "" +"ソフトウェアアップデートはエラーを訂正し、セキュリティホールを修正し、新機能" +"を提供します。" #: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" @@ -1163,7 +1229,9 @@ msgstr "インターネットアップデート" msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" -msgstr "公式な Ubuntu サーバからのセキュリティアップデートだけ自動的にインストールされます。" +msgstr "" +"公式な Ubuntu サーバからのセキュリティアップデートだけ自動的にインストールさ" +"れます。" #: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" @@ -1225,7 +1293,8 @@ msgid "" msgstr "" "チャンネルの情報が古いです\n" "\n" -"新規追加ないし変更したチャンネルからインストールまたはアップデートを行うため、チャンネルを再読み込みしてください。\n" +"新規追加ないし変更したチャンネルからインストールまたはアップデートを行うた" +"め、チャンネルを再読み込みしてください。\n" "\n" "続けるためには、インターネット接続が有効になっている必要があります。" @@ -1260,8 +1329,8 @@ msgid "" msgstr "" "追加したい完全な APT line を入力してください。\n" "\n" -"APT lineにはタイプ、場所、チャンネルのセクションなどを含めることができます。例:\"deb http://ftp.debian.org " -"sarge main\"" +"APT lineにはタイプ、場所、チャンネルのセクションなどを含めることができます。" +"例:\"deb http://ftp.debian.org sarge main\"" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1305,7 +1374,9 @@ msgstr "アップデートマネージャー" msgid "" "Check automatically if a new version of the current distribution is " "available and offer to upgrade (if possible)." -msgstr "現在使用中のディストリビューションの最新バージョンが存在する場合自動的にチェックし、可能ならアップグレードを提案する" +msgstr "" +"現在使用中のディストリビューションの最新バージョンが存在する場合自動的に" +"チェックし、可能ならアップグレードを提案する" #: ../data/update-manager.schemas.in.h:2 msgid "Check for new distribution releases" @@ -1318,7 +1389,8 @@ msgid "" "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" -"アップデートの自動チェックを無効にすると、チャンネルリストを手動で再読み込みしなければなりません。このオプションはその場合の催促をしないようにします。" +"アップデートの自動チェックを無効にすると、チャンネルリストを手動で再読み込み" +"しなければなりません。このオプションはその場合の催促をしないようにします。" #: ../data/update-manager.schemas.in.h:4 msgid "Remind to reload the channel list" @@ -1348,205 +1420,249 @@ msgstr "ウィンドウのサイズ" msgid "Configure the sources for installable software and updates" msgstr "ソフトウェアチャンネルとインターネットアップデートを設定" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 アップデート" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "コミュニティによるメンテナンス (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "デバイス用のプロプライエタリなドライバ" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "寄贈ソフトウェア" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft' のCD-ROM" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "コミュニティによるメンテナンス (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "コミュニティによるメンテナンス (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "コミュニティによるメンテナンス (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非フリー (Multiuniverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "デバイス用のプロプライエタリなドライバ " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非フリー (Multiuniverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "バックポートされたアップデート" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu·5.10·'Breezy·Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu·5.10·'Breezy·Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 アップデート" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 バックポート" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officially supported" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 アップデート" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 バックポート" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu·5.10·'Breezy·Badger'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiuniverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "いくつかのソフトウェアはもう公式にサポートされません" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 セキュリティアップデート" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 アップデート" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 バックポート" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian·3.1·\"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian·3.1·\"Sarge\"·セキュリティアップデート" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian·\"Etch\"·(testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian·\"Sid\"·(unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSGに適合しないソフトウェア" @@ -1555,7 +1671,6 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "ダウンロード中: 速度不明で %li のうち %li" @@ -1579,7 +1694,8 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Ubuntu 6.06 LTS にアップデート中" +#~ "Ubuntu 6.06 LTS にアップデート中" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1600,23 +1716,25 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgstr "" #~ "システムを解析中です\n" #~ "\n" -#~ "ソフトウェアアップデートはエラーを修正し、セキュリティホールを修正し、新機能を提供します。" +#~ "ソフトウェアアップデートはエラーを修正し、セキュリティホールを修正し、新機" +#~ "能を提供します。" #~ msgid "Oficially supported" #~ msgstr "公式サポート" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "ほかのソフトを削除しなければならないアップデートがあります。完全にアップグレードするためにはパッケージマネージャ \"Synaptic\" の " -#~ "\"すべてのアップグレードににマーク\"機能を使うか。端末から \"sudo apt-get dist-upgrade\" を実行してください。" +#~ "ほかのソフトを削除しなければならないアップデートがあります。完全にアップグ" +#~ "レードするためにはパッケージマネージャ \"Synaptic\" の \"すべてのアップグ" +#~ "レードににマーク\"機能を使うか。端末から \"sudo apt-get dist-upgrade\" を" +#~ "実行してください。" #~ msgid "The following updates will be skipped:" #~ msgstr "これらのパッケージはアップグレードされません:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "およそ残り %li 秒" @@ -1636,11 +1754,14 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgstr "詳細を表示" #~ msgid "Only one software management tool is allowed to run at the same time" -#~ msgstr "ソフトウェアマネージメントツールは同時に1つしか実行することができません" +#~ msgstr "" +#~ "ソフトウェアマネージメントツールは同時に1つしか実行することができません" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -#~ msgstr "まず 'aptitude' または 'Synaptic' など、ほかのアプリケーションを終了してください。" +#~ msgstr "" +#~ "まず 'aptitude' または 'Synaptic' など、ほかのアプリケーションを終了してく" +#~ "ださい。" #~ msgid "Channels" #~ msgstr "チャンネル" @@ -1692,9 +1813,11 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgstr "Ubuntu 6.06 LTS バックポート" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" -#~ msgstr "アップグレードするためにリポジトリ情報を調べている際、正しくないエントリがみつかりました。\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" +#~ msgstr "" +#~ "アップグレードするためにリポジトリ情報を調べている際、正しくないエントリが" +#~ "みつかりました。\n" #~ msgid "Repositories changed" #~ msgstr "リポジトリが変更されました" @@ -1702,17 +1825,20 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" -#~ msgstr "変更点を有効にするためにパッケージリストをサーバから再取得する必要があります。今すぐ実行しますか?" +#~ msgstr "" +#~ "変更点を有効にするためにパッケージリストをサーバから再取得する必要がありま" +#~ "す。今すぐ実行しますか?" #~ msgid "Sections" #~ msgstr "セクション:" #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. Please try " -#~ "'sudo apt-get install -f' or Synaptic to fix your system." +#~ "The upgrade aborts now. Your system can be in an unusable state. Please " +#~ "try 'sudo apt-get install -f' or Synaptic to fix your system." #~ msgstr "" -#~ "アップグレードを中断しました。システムが不安定な状態になっています。システムを修正するために 'sudo apt-get install -f ' " -#~ "または Synapticを試してみてください。" +#~ "アップグレードを中断しました。システムが不安定な状態になっています。システ" +#~ "ムを修正するために 'sudo apt-get install -f ' または Synapticを試してみて" +#~ "ください。" #~ msgid "Remove obsolete Packages?" #~ msgstr "古いパッケージ削除しますか？" @@ -1721,18 +1847,19 @@ msgstr "DFSGに適合しないソフトウェア" #~ "Upgrading to Ubuntu \"Dapper\" " #~ "6.04" #~ msgstr "" -#~ "Ubuntu·\"Dapper\"·6.04 " -#~ "にアップグレード中" +#~ "Ubuntu·\"Dapper\"·6.04 にアップグ" +#~ "レード中" #~ msgid "" #~ "Checking for available updates\n" #~ "\n" -#~ "Software updates can correct errors, eliminate security vulnerabilities, and " -#~ "provide new features to you." +#~ "Software updates can correct errors, eliminate security vulnerabilities, " +#~ "and provide new features to you." #~ msgstr "" #~ "アップデートをチェック中\n" #~ "\n" -#~ "アップデートによってソフトウェアの問題を修正し、セキュリティホールを除去し、新機能を追加します。" +#~ "アップデートによってソフトウェアの問題を修正し、セキュリティホールを除去" +#~ "し、新機能を追加します。" #~ msgid "Sections:" #~ msgstr "セクション:" @@ -1775,11 +1902,12 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "" #~ "There is not enough free space on your system to download the required " -#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " -#~ "clean'" +#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-" +#~ "get clean'" #~ msgstr "" -#~ "システムに要求されたパッケージをダウンロードするだけの十分な空き容量がありません。再び試行する前に 'sudo apt-get clean' " -#~ "などで空き容量を確保してください" +#~ "システムに要求されたパッケージをダウンロードするだけの十分な空き容量があり" +#~ "ません。再び試行する前に 'sudo apt-get clean' などで空き容量を確保してくだ" +#~ "さい" #~ msgid "Error fetching the packages" #~ msgstr "パッケージ取得中にエラー" @@ -1787,7 +1915,9 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "" #~ "Some problem occured during the fetching of the packages. This is most " #~ "likely a network problem. Please check your network and try again. " -#~ msgstr "パッケージを取得中になんらかのエラーが発生しました。おそらくネットワークの問題です。ネットワークを確認して再試行してください。 " +#~ msgstr "" +#~ "パッケージを取得中になんらかのエラーが発生しました。おそらくネットワークの" +#~ "問題です。ネットワークを確認して再試行してください。 " #~ msgid "" #~ "%s packages are going to be removed.\n" @@ -1812,9 +1942,11 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgstr "本当にキャンセルしますか？" #~ msgid "" -#~ "Canceling during a upgrade can leave the system in a unstable state. It is " -#~ "strongly adviced to continue the operation. " -#~ msgstr "アップグレード中にキャンセルすると、システムが不安定な状態になります。動作を継続することを強く忠告します。 " +#~ "Canceling during a upgrade can leave the system in a unstable state. It " +#~ "is strongly adviced to continue the operation. " +#~ msgstr "" +#~ "アップグレード中にキャンセルすると、システムが不安定な状態になります。動作" +#~ "を継続することを強く忠告します。 " #, fuzzy #~ msgid "Sources" @@ -1848,15 +1980,18 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgstr "" #~ "認証鍵\n" #~ "\n" -#~ "認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完全なものか確認することができます。" +#~ "認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完" +#~ "全なものか確認することができます。" #~ msgid "A_uthentication" #~ msgstr "認証(_U)" #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " -#~ msgstr "新しい鍵ファイルを信頼されたキーリングに追加します。セキュアなチャンネル経由で鍵を取得し、信頼される持ち主のものか確認してください。 " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " +#~ msgstr "" +#~ "新しい鍵ファイルを信頼されたキーリングに追加します。セキュアなチャンネル経" +#~ "由で鍵を取得し、信頼される持ち主のものか確認してください。 " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "一時ファイルを自動的に削除する(_T)" @@ -1877,9 +2012,11 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgstr "最大量(MB):" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." -#~ msgstr "ディストリビューション付属のデフォルトの鍵を元に戻します。この変更によりユーザが追加した鍵が失われることはありません。" +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." +#~ msgstr "" +#~ "ディストリビューション付属のデフォルトの鍵を元に戻します。この変更により" +#~ "ユーザが追加した鍵が失われることはありません。" #~ msgid "Set _maximum size for the package cache" #~ msgstr "パッケージキャッシュの最大量を設定する(_M)" @@ -1905,26 +2042,27 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "アップデートがあります\n" #~ "\n" -#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれらのパッケージがインストールされます。" +#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれら" +#~ "のパッケージがインストールされます。" #~ msgid "" #~ "Reload the package information from the server. \n" #~ "\n" -#~ "If you have a permanent internet connection this is done automatically. If " -#~ "you are behind an internet connection that needs to be started by hand (e.g. " -#~ "a modem) you should use this button so that update-manager knows about new " -#~ "updates." +#~ "If you have a permanent internet connection this is done automatically. " +#~ "If you are behind an internet connection that needs to be started by hand " +#~ "(e.g. a modem) you should use this button so that update-manager knows " +#~ "about new updates." #~ msgstr "" #~ "サーバからパッケージ情報を読み込み直します。\n" #~ "\n" -#~ "" -#~ "ずっとインターネットに接続されたままなら、自動的に行います。アナログモデムなどでそうではないなら、アップデートマネージャに新しいアップデートがあるかどうかを" -#~ "知らせるため、このボタンを使用して手動で行う必要があります。" +#~ "ずっとインターネットに接続されたままなら、自動的に行います。アナログモデム" +#~ "などでそうではないなら、アップデートマネージャに新しいアップデートがあるか" +#~ "どうかを知らせるため、このボタンを使用して手動で行う必要があります。" #~ msgid "Binary" #~ msgstr "バイナリ" @@ -1945,7 +2083,8 @@ msgstr "DFSGに適合しないソフトウェア" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" -#~ "インストールされたパッケージの依存性が満たせないようです。\"Synaptic\" または \"apt-get\" を使用して修正してください。" +#~ "インストールされたパッケージの依存性が満たせないようです。\"Synaptic\" ま" +#~ "たは \"apt-get\" を使用して修正してください。" #~ msgid "It is not possible to upgrade all packages." #~ msgstr "全てのパッケージをアップグレードすることは不可能です。" @@ -1953,21 +2092,27 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "パッケージのアップグレードの他にパッケージのインストールや削除などの別の対処がいるようです。Synaptic \"Smart " -#~ "Upgrade\"か\"apt-get dist-upgrade\"を実行して問題を修正してください。" +#~ "パッケージのアップグレードの他にパッケージのインストールや削除などの別の対" +#~ "処がいるようです。Synaptic \"Smart Upgrade\"か\"apt-get dist-upgrade\"を実" +#~ "行して問題を修正してください。" #~ msgid "Changes not found, the server may not be updated yet." -#~ msgstr "変更点は見つかりませんでした。サーバはまだアップデートされていないようです。" +#~ msgstr "" +#~ "変更点は見つかりませんでした。サーバはまだアップデートされていないようで" +#~ "す。" #~ msgid "The updates are being applied." #~ msgstr "アップデートされました。" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." -#~ msgstr "同時にひとつのパッケージマネージャしか起動できません。先に他のアプリケーションマネージャを終了してください。" +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." +#~ msgstr "" +#~ "同時にひとつのパッケージマネージャしか起動できません。先に他のアプリケー" +#~ "ションマネージャを終了してください。" #~ msgid "Updating package list..." #~ msgstr "アップデートされるパッケージのリスト..." @@ -1977,22 +2122,22 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "新しいUbuntu " -#~ "Linuxにアップグレードしてください。現在お使いのシステムにはセキュリティフィクスや危急のアップデートはすでに提供されていません。アッ" -#~ "プグレードに関する情報は http://www.ubuntulinux.org/ を見てください。" +#~ "新しいUbuntu Linuxにアップグレードしてください。現在お使いのシステムにはセ" +#~ "キュリティフィクスや危急のアップデートはすでに提供されていません。アップグ" +#~ "レードに関する情報は http://www.ubuntulinux.org/ を見てください。" #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Ubuntuの新しいリリース版があります！" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "コードネーム '%s' という新しいリリース版があります。アップグレードするために http://www.ubuntulinux.org/ " -#~ "をご覧ください。" +#~ "コードネーム '%s' という新しいリリース版があります。アップグレードするため" +#~ "に http://www.ubuntulinux.org/ をご覧ください。" #~ msgid "Never show this message again" #~ msgstr "このメッセージを二度と表示しない" @@ -2001,10 +2146,11 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgstr "排他的なロックができません" #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "同時にひとつのパッケージマネージャしか起動できません。先に atp-get や aptitudeのような他のパッケージマネージャを終了してください。" +#~ "同時にひとつのパッケージマネージャしか起動できません。先に atp-get や " +#~ "aptitudeのような他のパッケージマネージャを終了してください。" #~ msgid "Initializing and getting list of updates..." #~ msgstr "アップデートリストを取得中..." @@ -2021,9 +2167,10 @@ msgstr "DFSGに適合しないソフトウェア" #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "利用可能なアップデート\n" #~ "\n" -#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれらのパッケージがインストールされます。" \ No newline at end of file +#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれら" +#~ "のパッケージがインストールされます。" diff --git a/po/ka.po b/po/ka.po index 067f4ffd..53b668c7 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:39+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian \n" @@ -57,13 +57,15 @@ msgstr "ერთი თვის შემდგომ" msgid "After %s days" msgstr "%s დღის შემდეგ" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "განახლებების _დაყენება" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -73,6 +75,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -125,13 +128,12 @@ msgid "Error removing the key" msgstr "გასღების წაშლა ვერ მოხერხდა" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი." #: ../SoftwareProperties/SoftwareProperties.py:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -171,6 +173,7 @@ msgstr "საჭჳრო მეტა-პაკეტების განა msgid "A essential package would have to be removed" msgstr "A არსებითი -სკენ" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 #, fuzzy msgid "Could not calculate the upgrade" @@ -186,6 +189,7 @@ msgid "" msgstr "" "მოხდა დაუდგენელი შეცდომა განახლების დათვლისას. შეატყობინეთ ეს როგორხ ხარვეზი." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა" @@ -209,9 +213,9 @@ msgstr "'%s' ვერ დაყენდა" msgid "" "It was impossible to install a required package. Please report this as a " "bug. " -msgstr "" -"საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. " +msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "მეტა-პაკეტი ვერ გამოვიცანით" @@ -275,6 +279,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 #, fuzzy msgid "Generate default sources?" @@ -338,6 +343,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "გნებავთ განახლების დაწყება?" @@ -407,6 +413,7 @@ msgid "" "more information. " msgstr "-თვის ინფორმაცია " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -417,6 +424,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -473,6 +481,7 @@ msgstr "ვეძებ -თვის" msgid "System upgrade is complete." msgstr "სისტემა ტოლია სრული." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -501,6 +510,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "ცვლილებების დამტკიცება" @@ -516,6 +526,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -542,15 +553,16 @@ msgstr "A შეცდომა" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "a და შემცველობა და -ში ახლა თავდაპირველი სია -ში სია." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "A არსებითი -სკენ" @@ -587,8 +599,9 @@ msgstr "საათი და ნებისმიერი დრო." msgid "To prevent data loss close all open applications and documents." msgstr "ვის დახურვა ყველა გახსნა და დოკუმენტები." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "თქვენი სისტემა განახლებულია" @@ -634,6 +647,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -654,6 +668,7 @@ msgstr "ტოლია დასრულდა და a ტოლია -ს #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -767,6 +782,7 @@ msgstr "შეუძლებელია ვერსიის შენიშ msgid "Please check your internet connection." msgstr "გთხოვთ შეამოწმოთ თქვენი ინტერნეტ კავშირი." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "ვერ ვრთავ განახლების ჩადგმის ხელსაწყოს" @@ -871,15 +887,18 @@ msgid "" "Please check your Internet connection." msgstr "ვერ განხორციელდა -სკენ სია ის ინტერნეტი." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -895,74 +914,77 @@ msgstr "Ubuntu 5.10 დამატებითი პროგრამებ msgid "Distribution updates" msgstr "განახლება _გაგრძელება" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "განახლებების _დაყენება" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "ვერსია %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "მიმდინარეობს ჩამოქაჩვა სია ის." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "შ_ემოწმება" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "ჩამოსატვირთის ზომა: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "განახლება გასრულებულია" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "განახლებების _დაყენება" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "ახალი ვერსია: %s (ზომა: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "ვერსია %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 #, fuzzy msgid "" "You will not get any further security fixes or critical updates. Upgrade to " @@ -972,16 +994,17 @@ msgstr "" "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი " "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "პროგრამების სიის ინდექსი დაზიანებულია" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 #, fuzzy msgid "" "It is impossible to install or remove any software. Please use the package " @@ -990,19 +1013,23 @@ 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" @@ -1369,203 +1396,248 @@ msgstr "ფანჯარა ზომა" msgid "Configure the sources for installable software and updates" msgstr "კონფიგურირება და" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 -#, fuzzy +#, fuzzy, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/ s s s s s" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 განახლებები" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "არათავისუფალი (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "არათავისუფალი (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "არათავისუფალი (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 განახლებები" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 განახლებები" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "არათავისუფალი (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "არა" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 #, fuzzy msgid "Restricted copyright" msgstr "შეზღუდული" +#. Description #: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 განახლებები" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 -#, fuzzy +#, fuzzy, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/ s s s s s" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "უსაფრთხოება" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 #, fuzzy msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "პროგრამა თავისუფალი დამოკიდებულებანი" +#. CompDescription #: ../data/channels/Debian.info.in:57 #, fuzzy msgid "Non-DFSG-compatible Software" @@ -1618,8 +1690,8 @@ msgstr "პროგრამა" #, fuzzy #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "ის გამოყენება მონიშვნა ყველა ის Synaptic ან sudo -ში a ტერმინალი -სკენ " #~ "განახლება." @@ -1698,4 +1770,4 @@ msgstr "პროგრამა" #~ msgstr "Ubuntu 6.06 LTS განახლებები" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Ubuntu 6.06 LTS დამატებითი პროგრამები" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS დამატებითი პროგრამები" diff --git a/po/ko.po b/po/ko.po index cb8c6fe3..2ee4468a 100644 --- a/po/ko.po +++ b/po/ko.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-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-06 11:33+0000\n" "Last-Translator: Eungkyu Song \n" "Language-Team: Korean \n" @@ -54,6 +54,7 @@ msgstr "한달 후에" msgid "After %s days" msgstr "%s일 후에" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "%s 업데이트" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "주 서버" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -119,8 +122,7 @@ msgid "Error removing the key" msgstr "키 삭제 오류" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "선택한 키를 지울 수 없습니다. 버그를 보고하십시오." #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -151,7 +153,8 @@ msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -"이 소프트웨어로 고칠 수 없는 망가진 패키지가 있습니다. 진행하기 전에 먼저 시냅틱이나 apt-get을 사용하여 복구하십시오." +"이 소프트웨어로 고칠 수 없는 망가진 패키지가 있습니다. 진행하기 전에 먼저 시" +"냅틱이나 apt-get을 사용하여 복구하십시오." #: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" @@ -161,6 +164,7 @@ msgstr "요청한 메타 패키지를 업그레이드 할 수 없습니다" msgid "A essential package would have to be removed" msgstr "필수적인 패키지를 제거해야만 합니다." +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다." @@ -172,11 +176,13 @@ msgid "" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"업그레이드에 필요한 의존성을 계산하던 중 해결할 수 없는 문제가 발생했습니다.\n" +"업그레이드에 필요한 의존성을 계산하던 중 해결할 수 없는 문제가 발생했습니" +"다.\n" "\n" -"'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/log/dist-upgrade/에 있는 " -"파일을 포함하여 주십시오." +"'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/" +"log/dist-upgrade/에 있는 파일을 포함하여 주십시오." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "패키지 인증 오류" @@ -187,8 +193,8 @@ msgid "" "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -"인증할 수 없는 패키지가 있습니다. 일시적인 네트워크 문제일 수 있으니 이 경우라면 나중에 다시 시도하십시오. 인증되지 않은 패키지의 " -"목록은 다음과 같습니다." +"인증할 수 없는 패키지가 있습니다. 일시적인 네트워크 문제일 수 있으니 이 경우" +"라면 나중에 다시 시도하십시오. 인증되지 않은 패키지의 목록은 다음과 같습니다." #: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format @@ -201,6 +207,7 @@ msgid "" "bug. " msgstr "요청한 패키지를 설치할 수 없습니다. 버그를 보고하여 주십시오. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "메타 패키지를 추측할 수 없습니다" @@ -213,9 +220,10 @@ msgid "" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -"시스템에 ubuntu-desktop이나 kubuntu-desktop 또는 edubuntu-desktop 패키지가 없으며, 현재 실행중인 " -"우분투의 버전을 알아낼 수 없습니다.\n" -" 위의 패키지 중 하나를 시냅틱이나 apt-get을 이용해서 먼저 설치하시기 바랍니다." +"시스템에 ubuntu-desktop이나 kubuntu-desktop 또는 edubuntu-desktop 패키지가 없" +"으며, 현재 실행중인 우분투의 버전을 알아낼 수 없습니다.\n" +" 위의 패키지 중 하나를 시냅틱이나 apt-get을 이용해서 먼저 설치하시기 바랍니" +"다." #: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" @@ -230,8 +238,8 @@ msgid "" "The error message was:\n" "'%s'" msgstr "" -"CD를 더할 때 오류가 발생하였기 때문에 업그레이드는 중단될 것입니다. 올바른 우분투 CD를 사용하고 있었다면 이 버그를 보고해 " -"주십시오.\n" +"CD를 더할 때 오류가 발생하였기 때문에 업그레이드는 중단될 것입니다. 올바른 우" +"분투 CD를 사용하고 있었다면 이 버그를 보고해 주십시오.\n" "\n" "오류 메시지:\n" "'%s'" @@ -251,8 +259,10 @@ msgid "" "If you have fast or inexpensive network access you should answer 'Yes' here. " "If networking is expensive for you choose 'No'." msgstr "" -"업그레이드할 때 네트워크를 이용하여 최신 업데이트를 확인하고 현재 CD에 없는 패키지를 받을 수 있습니다.\n" -"빠르고 값싼 네트워크를 이용하고 있다면 '예'를 선택하는 것이 좋습니다. 네트워크를 이용하는 것이 값싸지 않다면 '아니오'를 선택하십시오." +"업그레이드할 때 네트워크를 이용하여 최신 업데이트를 확인하고 현재 CD에 없는 " +"패키지를 받을 수 있습니다.\n" +"빠르고 값싼 네트워크를 이용하고 있다면 '예'를 선택하는 것이 좋습니다. 네트워" +"크를 이용하는 것이 값싸지 않다면 '아니오'를 선택하십시오." #: ../DistUpgrade/DistUpgradeControler.py:248 msgid "No valid mirror found" @@ -269,12 +279,15 @@ msgid "" "here it will update all '%s' to '%s' entries.\n" "If you select 'no' the update will cancel." msgstr "" -"업그레이드를 하기 위해 저장소 정보를 검색할 때 미러 서버 항목을 찾지 못했습니다. 내부 미러 서버를 운영하고 있거나 미러 서버 정보가 " -"오래됐을 때 이러한 문제가 일어날 수 있습니다.\n" +"업그레이드를 하기 위해 저장소 정보를 검색할 때 미러 서버 항목을 찾지 못했습니" +"다. 내부 미러 서버를 운영하고 있거나 미러 서버 정보가 오래됐을 때 이러한 문제" +"가 일어날 수 있습니다.\n" "\n" -"'sources.list' 파일을 다시 작성하시겠습니까? '예'를 선택하면 '%s' 전체를 '%s' 항목으로 업데이트 합니다.\n" +"'sources.list' 파일을 다시 작성하시겠습니까? '예'를 선택하면 '%s' 전체를 '%" +"s' 항목으로 업데이트 합니다.\n" "'아니오'를 선택하면 업데이트가 취소됩니다." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "기본 설정된 소스 목록을 만듭니까?" @@ -289,7 +302,8 @@ msgid "" msgstr "" "'sources.list'를 검색했지만 '%s'에 적합한 항목을 찾지 못했습니다.\n" "\n" -"'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 선택하면 업데이트가 취소됩니다." +"'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 선택하면 업데이트가 취소" +"됩니다." #: ../DistUpgrade/DistUpgradeControler.py:301 msgid "Repository information invalid" @@ -299,7 +313,9 @@ msgstr "저장소 정보가 올바르지 않습니다" msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." -msgstr "저장소 정보를 업그레이드했는데 잘못된 파일이 만들어졌습니다. 버그를 보고하여 주십시오." +msgstr "" +"저장소 정보를 업그레이드했는데 잘못된 파일이 만들어졌습니다. 버그를 보고하여 " +"주십시오." #: ../DistUpgrade/DistUpgradeControler.py:308 msgid "Third party sources disabled" @@ -311,8 +327,9 @@ msgid "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -"souces.list에서 써드 파티 목록의 일부는 이용할 수 없게 되었습니다. 'software-properties' 도구나 시냅틱으로 " -"업그레이드 한 후에 다시 사용가능하게 할 수 있습니다." +"souces.list에서 써드 파티 목록의 일부는 이용할 수 없게 되었습니다. 'software-" +"properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하게 할 수 있습" +"니다." #: ../DistUpgrade/DistUpgradeControler.py:358 msgid "Error during update" @@ -323,7 +340,8 @@ 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:368 msgid "Not enough free disk space" @@ -336,9 +354,11 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"업그레이드가 중단되었습니다. 적어도 %s 정도의 디스크 공간을 %s에 확보하시기 바랍니다. 휴지통을 비우시고 'sudo apt-get " -"clean' 명령으로 이전 설치 과정 중에 사용했던 임시 패키지들을 삭제하시기 바랍니다." +"업그레이드가 중단되었습니다. 적어도 %s 정도의 디스크 공간을 %s에 확보하시기 " +"바랍니다. 휴지통을 비우시고 'sudo apt-get clean' 명령으로 이전 설치 과정 중" +"에 사용했던 임시 패키지들을 삭제하시기 바랍니다." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" @@ -355,11 +375,11 @@ msgid "" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"업그레이드가 중단되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. (dpkg --configure -a)를 실행하여 " -"복구하십시오.\n" +"업그레이드가 중단되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. " +"(dpkg --configure -a)를 실행하여 복구하십시오.\n" "\n" -"'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/log/dist-upgrade/에 있는 " -"파일을 포함하여 주십시오." +"'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/" +"log/dist-upgrade/에 있는 파일을 포함하여 주십시오." #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -369,7 +389,9 @@ msgstr "업그레이를 다운로드 할 수 없습니다." msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " -msgstr "업그레이드가 중단되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도하십시오. " +msgstr "" +"업그레이드가 중단되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도" +"하십시오. " #: ../DistUpgrade/DistUpgradeControler.py:516 msgid "Support for some applications ended" @@ -383,9 +405,11 @@ msgid "" "If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -"Canonical Ltd.는 다음의 소프트웨어 패키지를 더 이상 지원하지 않습니다. 커뮤니티를 통해서 여전히 지원받을 수 있습니다.\n" +"Canonical Ltd.는 다음의 소프트웨어 패키지를 더 이상 지원하지 않습니다. 커뮤니" +"티를 통해서 여전히 지원받을 수 있습니다.\n" "\n" -"커뮤니티 관리 소프트웨어를 (universe) 활성화하지 않았다면, 다음 단계에서 이 패키지들을 삭제하도록 제안할 것입니다." +"커뮤니티 관리 소프트웨어를 (universe) 활성화하지 않았다면, 다음 단계에서 이 " +"패키지들을 삭제하도록 제안할 것입니다." #: ../DistUpgrade/DistUpgradeControler.py:552 msgid "Remove obsolete packages?" @@ -407,8 +431,11 @@ msgstr "커밋 도중 오류 발생" msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " -msgstr "정리하는 도중에 문제가 발생하였습니다. 다음의 메시지에서 더 많은 정보를 확인할 수 있습니다. " +msgstr "" +"정리하는 도중에 문제가 발생하였습니다. 다음의 메시지에서 더 많은 정보를 확인" +"할 수 있습니다. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "시스템을 원래의 상태로 복구하고 있습니다" @@ -419,6 +446,7 @@ msgid "Fetching backport of '%s'" msgstr "'%s'의 백포트를 받고 있습니다" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -453,8 +481,8 @@ msgid "" "bugreport." msgstr "" "패키지 정보를 업데이트한 다음에 필수 패키지 '%s'를 더이상 찾을 수 없습니다.\n" -"심각한 오류입니다. 'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/log/dist-" -"upgrade/에 있는 파일을 포함하여 주십시오." +"심각한 오류입니다. 'update-manager' 패키지의 버그를 보고하여 주십시오. 그리" +"고 버그 보고에 /var/log/dist-upgrade/에 있는 파일을 포함하여 주십시오." #: ../DistUpgrade/DistUpgradeControler.py:733 msgid "Asking for confirmation" @@ -472,6 +500,7 @@ msgstr "구식 소프트웨어를 검색하고 있습니다" msgid "System upgrade is complete." msgstr "완전히 시스템을 업그레이드하였습니다." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -499,6 +528,7 @@ msgstr "%li의 %li 파일 내려받는 중" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "변경 사항을 적용하고 있습니다" @@ -513,9 +543,11 @@ msgid "" "The upgrade aborts now. Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"업그레이드가 중단되었습니다. 'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 " -"/var/log/dist-upgrade/에 있는 파일을 포함하여 주십시오." +"업그레이드가 중단되었습니다. 'update-manager' 패키지의 버그를 보고하여 주십시" +"오. 그리고 버그 보고에 /var/log/dist-upgrade/에 있는 파일을 포함하여 주십시" +"오." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -541,16 +573,18 @@ msgstr "심각한 오류 발생" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"이 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/log/dist-upgrade/main.log 파일과 /var/log/dist-" -"upgrade/apt.log 파일을 포함하여 주십시오. 업그레이드가 중단되었습니다.\n" +"이 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/log/dist-upgrade/main." +"log 파일과 /var/log/dist-upgrade/apt.log 파일을 포함하여 주십시오. 업그레이드" +"가 중단되었습니다.\n" "원래의 sources.list는 /etc/apt/sources.list.distUpgrade에 저장되어 있습니다." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -584,14 +618,17 @@ msgstr "" msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." -msgstr "업그레이드를 받아 설치하는 것은 여러 시간이 걸릴 수 있으며, 이후 어떤 경우에도 취소할 수 없습니다." +msgstr "" +"업그레이드를 받아 설치하는 것은 여러 시간이 걸릴 수 있으며, 이후 어떤 경우에" +"도 취소할 수 없습니다." #: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문서를 닫으십시오." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "시스템이 최신의 상태입니다." @@ -637,6 +674,7 @@ msgid "%li seconds" msgstr "%li초" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -656,6 +694,7 @@ msgstr "업그레이드가 끝났으며 다시 시작해야 합니다. 지금 #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -670,7 +709,8 @@ msgid "" msgstr "" "실행 중인 업그레이드를 취소하시겠습니까?\n" "\n" -"업그레이드를 취소하면 시스템이 사용할 수 없는 상태가 될 수 있습니다. 업그레이드를 계속 하시기를 강력히 건의합니다." +"업그레이드를 취소하면 시스템이 사용할 수 없는 상태가 될 수 있습니다. 업그레이" +"드를 계속 하시기를 강력히 건의합니다." #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" @@ -764,6 +804,7 @@ msgstr "릴리즈 정보를 다운로드 할 수 없습니다." msgid "Please check your internet connection." msgstr "인터넷 연결 상태를 확인하십시오." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "업그레이드 도구를 실행할 수 없습니다." @@ -805,7 +846,9 @@ msgstr "압축 풀기 실패" msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " -msgstr "업그레이드의 압축을 푸는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니다. " +msgstr "" +"업그레이드의 압축을 푸는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있" +"습니다. " #: ../UpdateManager/DistUpgradeFetcher.py:221 msgid "Verfication failed" @@ -815,7 +858,9 @@ msgstr "확인 실패" msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " -msgstr "업그레이드를 확인하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니다. " +msgstr "" +"업그레이드를 확인하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습" +"니다. " #: ../UpdateManager/DistUpgradeFetcher.py:228 msgid "Authentication failed" @@ -825,12 +870,15 @@ msgstr "인증 실패" msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " -msgstr "업그레이드를 인증하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니다. " +msgstr "" +"업그레이드를 인증하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니" +"다. " #: ../UpdateManager/GtkProgress.py:108 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" -msgstr "%(total)li개중 %(current)li번째 파일을 %(speed)s/s의 속도로 받고 있습니다" +msgstr "" +"%(total)li개중 %(current)li번째 파일을 %(speed)s/s의 속도로 받고 있습니다" #: ../UpdateManager/GtkProgress.py:113 #, python-format @@ -853,14 +901,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "중요한 보안 업데이트" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "추천하는 업데이트" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "제안하는 업데이트" @@ -873,109 +924,118 @@ msgstr "Backports" msgid "Distribution updates" msgstr "배포판 업데이트" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "기타 업데이트" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "버전 %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "변경 사항 목록을 다운로드하고 있습니다..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "전체 선택 취소(_U)" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "전체 선택(_C)" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "다운로드 크기: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "업데이트 %s개를 설치할 수 있습니다." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "완전히 업데이트하였습니다." -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "업데이트 확인" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "버전 %(old_version)s에서 %(new_version)s(으)로" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "버전 %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(크기: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "더 이상 지원되지 않는 배포판입니다." -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" -"더 이상 보안이나 중요 업데이트를 받을 수 없습니다. 최신의 우분투 리눅스로 업그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 " -"http://www.ubuntu.com에서 보실 수 있습니다." +"더 이상 보안이나 중요 업데이트를 받을 수 없습니다. 최신의 우분투 리눅스로 업" +"그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에" +"서 보실 수 있습니다." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "새 배포판 '%s'을(를) 설치할 수 있습니다" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "소프트웨어 목록이 망가졌습니다." -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 "" -"어떤 소프트웨어도 설치하거나 삭제할 수 없습니다. \"시냅틱\"이나 터미널에서 \"sudo apt-get install -f\"를 " -"실행하여 이 문제를 먼저 해결하십시오." +"어떤 소프트웨어도 설치하거나 삭제할 수 없습니다. \"시냅틱\"이나 터미널에서 " +"\"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 "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -990,7 +1050,8 @@ msgid "" msgstr "" "업데이트 확인을 직접 해야 합니다.\n" "\n" -"업데이트 확인이 자동으로 되지 않습니다. 이 동작은 인터넷 업데이트 탭의 소프트웨어 소스에서 설정할 수 있습니다." +"업데이트 확인이 자동으로 되지 않습니다. 이 동작은 인터넷 업데이트 탭" +"의 소프트웨어 소스에서 설정할 수 있습니다." #: ../data/glade/UpdateManager.glade.h:4 msgid "Keep your system up-to-date" @@ -1037,7 +1098,8 @@ msgid "" msgstr "" "배포판 업그레이드를 수행하여 가능한 많은 업데이트를 설치합니다. \n" "\n" -"이것은 완료되지 않은 업그레이드나 비공식 소프트웨어 패키지, 또는 개발버전에서 실행했기 때문일 수 있습니다." +"이것은 완료되지 않은 업그레이드나 비공식 소프트웨어 패키지, 또는 개발버전에" +"서 실행했기 때문일 수 있습니다." #: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" @@ -1051,7 +1113,9 @@ msgstr "소프트웨어 업데이트" msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." -msgstr "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공합니다." +msgstr "" +"소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" +"합니다." #: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" @@ -1111,10 +1175,12 @@ msgid "" "The results are used to improve the support for popular applications and to " "rank applications in the search results." msgstr "" -"우분투의 사용자 경험을 개선하기 위해 인기 경연에 참여해 주십시오. 그러면 설치된 소프트웨어의 목록과 사용하는 빈도를 수집하여 " -"우분투 프로젝트로 일주일에 한번씩 익명으로 전송합니다.\n" +"우분투의 사용자 경험을 개선하기 위해 인기 경연에 참여해 주십시오. 그러면 " +"설치된 소프트웨어의 목록과 사용하는 빈도를 수집하여 우분투 프로젝트로 일주일" +"에 한번씩 익명으로 전송합니다.\n" "\n" -"그 결과는 인기있는 프로그램의 지원을 개선하고 검색 결과에서 프로그램의 순위를 매기는데 사용합니다." +"그 결과는 인기있는 프로그램의 지원을 개선하고 검색 결과에서 프로그램의 순위" +"를 매기는데 사용합니다." #: ../data/glade/SoftwareProperties.glade.h:9 msgid "Add Cdrom" @@ -1202,7 +1268,8 @@ msgid "" msgstr "" "이용할 수 있는 소프트웨어에 대한 정보가 오래되었습니다.\n" "\n" -"새로 추가하거나 변경한 소스로부터 소프트웨어를 설치하거나 업데이트하려면, 이용할 수 있는 소프트웨어에 대한 정보를 다시 읽어야 합니다.\n" +"새로 추가하거나 변경한 소스로부터 소프트웨어를 설치하거나 업데이트하려면, 이" +"용할 수 있는 소프트웨어에 대한 정보를 다시 읽어야 합니다.\n" "\n" "계속하기 위해서는 인터넷 연결이 필요합니다." @@ -1234,10 +1301,11 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"추가하고자 하는 소스 저장소의 APT 줄을 완전히 입력하십시오.\n" +"추가하고자 하는 소스 저장소의 APT 줄을 완전히 입력하십시오.\n" "\n" -"APT 줄은 다음 예와 같이 채널의 종류, 위치, 구성요소를 포함합니다. \"deb http://ftp.debian.org " -"sarge main\"" +"APT 줄은 다음 예와 같이 채널의 종류, 위치, 구성요소를 포함합니다. \"deb " +"http://ftp.debian.org sarge main\"" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1279,7 +1347,8 @@ msgstr "업데이트 관리자" msgid "" "Check automatically if a new version of the current distribution is " "available and offer to upgrade (if possible)." -msgstr "현재 배포판에 새로운 버전이 있어서 업그레이드가 가능한지 자동으로 확인합니다." +msgstr "" +"현재 배포판에 새로운 버전이 있어서 업그레이드가 가능한지 자동으로 확인합니다." #: ../data/update-manager.schemas.in.h:2 msgid "Check for new distribution releases" @@ -1291,8 +1360,8 @@ msgid "" "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" -"자동 업데이트 확인 기능을 사용하지 않으면, 채널 목록을 수동으로 다시 읽어야 합니다. 이 옵션은 이 경우에 알림 기능이 나타나지 않도록 " -"합니다." +"자동 업데이트 확인 기능을 사용하지 않으면, 채널 목록을 수동으로 다시 읽어야 " +"합니다. 이 옵션은 이 경우에 알림 기능이 나타나지 않도록 합니다." #: ../data/update-manager.schemas.in.h:4 msgid "Remind to reload the channel list" @@ -1320,199 +1389,246 @@ msgstr "창 크기" msgid "Configure the sources for installable software and updates" msgstr "설치할 수 있는 소프트웨어와 업데이트를 위한 소스를 설정" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "우분투 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "커뮤니티에서 관리" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "장치의 독점 드라이버" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "제한된 소프트웨어" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "우분투 6.10 'Edgy Eft' 씨디롬" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "커뮤니티에서 관리 (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "커뮤니티에서 관리하는 오픈 소스 소프트웨어" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "비자유 드라이버" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "장치의 독점 드라이버 " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "제한된 소프트웨어 (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 LTS 'Dapper Drake' 씨디롬" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Backport 업데이트" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger' 씨디롬" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "우분투 5.10 보안 업데이트" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "우분투 5.10 업데이트" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "우분투 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "우분투 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "공식적으로 지원함" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "우분투 5.04 보안 업데이트" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "우분투 5.04 업데이트" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "우분투 5.04 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "우분투 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "커뮤니티에서 관리 (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "비자유 (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "우분투 4.10 'Warty Warthog' 씨디롬" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "더 이상 공식적으로 지원하지 않음" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "저작권이 제한됨" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "우분투 4.10 보안 업데이트" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "우분투 4.10 업데이트" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "우분투 4.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "데비안 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "데비안 3.1 \"Sarge\" 보안 업데이트" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "데비안 \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "데비안 \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG 호환이 되지만 비자유 소프트웨어에 의존하는 소프트웨어" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSG와 호환이 되지 않는 소프트웨어" #~ msgid "" -#~ "You will loose all customizations, that have been made by yourself or by a " -#~ "script, if you replace the file by its latest version." -#~ msgstr "파일을 최신 버전으로 교체할 경우 직접 또는 스크립트에 의해서 바뀐 모든 것을 잃어버릴 것입니다." +#~ "You will loose all customizations, that have been made by yourself or by " +#~ "a script, if you replace the file by its latest version." +#~ msgstr "" +#~ "파일을 최신 버전으로 교체할 경우 직접 또는 스크립트에 의해서 바뀐 모든 것" +#~ "을 잃어버릴 것입니다." -#, python-format #~ msgid "" -#~ "This download will take about %s with a 56k modem and about %s with a 1Mbit " -#~ "DSL connection" -#~ msgstr "이것을 다운로드하려면 56k 모뎀으로는 약 %s이(가) 걸리고 1Mbit DSL 연결로는 약 %s이(가) 걸립니다." +#~ "This download will take about %s with a 56k modem and about %s with a " +#~ "1Mbit DSL connection" +#~ msgstr "" +#~ "이것을 다운로드하려면 56k 모뎀으로는 약 %s이(가) 걸리고 1Mbit DSL 연결로" +#~ "는 약 %s이(가) 걸립니다." #~ msgid "The list of changes is not available yet. Please try again later." #~ msgstr "변경 사항 목록이 아직 없습니다. 잠시 후 다시 시도해 주십시오." @@ -1520,10 +1636,12 @@ msgstr "DFSG와 호환이 되지 않는 소프트웨어" #~ msgid "" #~ "Failed to download the list of changes. Please check your Internet " #~ "connection." -#~ msgstr "변경 사항 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오." +#~ msgstr "" +#~ "변경 사항 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시" +#~ "오." #~ msgid "By Canonical supported Open Source software" #~ msgstr "Canonical이 지원하는 오픈 소스 소프트웨어" #~ msgid "By copyright or legal issues restricted software" -#~ msgstr "저작권나 법적 문제가 제한된 소프트웨어" \ No newline at end of file +#~ msgstr "저작권나 법적 문제가 제한된 소프트웨어" diff --git a/po/ku.po b/po/ku.po index 27d3aac3..6f6e1835 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-04 06:52+0000\n" "Last-Translator: ElîxanLoran \n" "Language-Team: Kurdish \n" @@ -55,6 +55,7 @@ msgstr "Piştî mehekê" msgid "After %s days" msgstr "Piştî %s roj" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "%s rojanekirin" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Pêşkêşkera Mak" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,8 +125,7 @@ msgid "Error removing the key" msgstr "Di dema rakirina mifteyan de çewtî" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Mifteya ku te hilbijart nehate rakirin. Ji kerema xwe re vê yekê weke " "çewtiyekê ragihîne." @@ -168,6 +170,7 @@ msgstr "Pakêtên agahiyan yên pêwist nayên rojanekirin" msgid "A essential package would have to be removed" msgstr "Divê pakêteke pêwist jê were rakirin" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Rojanekirin nikaribû were hesabkirin" @@ -181,9 +184,10 @@ msgid "" msgstr "" "Dema bilindkirin hesab dikir çewtiyeke ku nayê veçirandin derkete holê.\n" "\n" -"Ji kerema xwe re vê çewtiyê bo 'update-manager' ragihîne, pelgehên ku li " -"/var/log/dist-upgrade/ de ye jî li rapora çewtiyan zêde bike." +"Ji kerema xwe re vê çewtiyê bo 'update-manager' ragihîne, pelgehên ku li /" +"var/log/dist-upgrade/ de ye jî li rapora çewtiyan zêde bike." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Di piştrastkirina çend paketan de çewtî derket" @@ -210,6 +214,7 @@ msgstr "" "Pakêta pêwist nehate barkirin. Ji kerema xwe re vê yekê weke çewtiyekê " "ragihîne. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Pakêta-meta nehate kifşkirin" @@ -291,6 +296,7 @@ msgstr "" "rojanekirin.\n" "Heke tu bibêjî 'Na' wê rojanekirin betal bibe." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Bile çavkaniyên rawêjî pêk bên?" @@ -359,6 +365,7 @@ msgstr "" "bike. Çopa xwe vala bikin û bi 'sudo apt-get clean' pakêtên derbasdar yên " "sazkirinên berê rake." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Tu dixwazî dest bi bilindkirinê bikî?" @@ -430,6 +437,7 @@ msgstr "" "Di dema paqijkirinê de hin pirsgirêk derketin. Ji bo agahiyan ji kerema xwe " "re li peyama jêr binihêre. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Vedigere rewşa pergala orjînal" @@ -440,6 +448,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -473,8 +482,8 @@ msgid "" "manager' package and include the files in /var/log/dist-upgrade/ in the " "bugreport." msgstr "" -"Piştî ku agahiyê te yên pakêtê hate rojanekirin, yek ji wan pakêtên girîng " -"'%s' êdî nayê dîtin.\n" +"Piştî ku agahiyê te yên pakêtê hate rojanekirin, yek ji wan pakêtên girîng '%" +"s' êdî nayê dîtin.\n" "Dibe ku ev çewtiyeke girîng e, ji kerema xwe re bo pakêta 'update-manager' " "vê çewtiyê ragihîne. Dosyeyên ku li /var/log/dist-upgrade/ de ye jî li " "peyama çewtiyê zêde bike." @@ -495,6 +504,7 @@ msgstr "Li nivîsbariya kevin tê gerandin" msgid "System upgrade is complete." msgstr "Bilindkirina sîstemê temam bû." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -523,6 +533,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Guherandin tê bi kar anîn" @@ -541,6 +552,7 @@ msgstr "" "çewtiyê ragihîne. Dosyeyên ku li /var/log/dist-upgrade/ de ye jî li peyama " "xwe ya çewtiyê zêde bike." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -566,9 +578,9 @@ msgstr "Çewtiyeke giran derket" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Ji kerema xwe re vê çewtiyê ragihîne.Dosyeyên ku li /var/log/dist-upgrade/ " @@ -578,29 +590,30 @@ msgstr "" "hate tomarkirin." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket dê were rakirin." msgstr[1] "%s paket dê werin rakirin." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s paket dê were sazkirin" msgstr[1] "%s paket dê werin sazkirin" #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket dê were bilindkirin." msgstr[1] "%s paket dê werin bilindkirin." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -622,8 +635,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "Ji bo ku dane winda nebin hemû sepan û pelgeyên ku vekirî ne bigire" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Sîstema te rojane ye" @@ -671,6 +685,7 @@ msgid "%li seconds" msgstr "%li çirke" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -691,6 +706,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -710,8 +726,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" msgstr "" -"Ji bo bidawîanîna bilindkirinê pergalê ji nû ve bide " -"destpêkirin" +"Ji bo bidawîanîna bilindkirinê pergalê ji nû ve bide destpêkirin" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -801,6 +817,7 @@ msgstr "Nîşeyên weşanê nehate daxistin" msgid "Please check your internet connection." msgstr "Ji kerema xwe girêdana înternetê kontrol bike." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Amûra bilindkirinê nikaribû bimeşîne" @@ -896,14 +913,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Rojanekirinên ewlekariyê yên girîng" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Rojanekirinên têne pêşniyarkirin" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Rojanekirinên hatine pêşniyarkirin" @@ -916,71 +936,74 @@ msgstr "" msgid "Distribution updates" msgstr "Rojanekirinên dîstrîbusiyonê" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Rojanekirinên din" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Guherto %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "Lîsteya guhartinan tê daxistin..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "Yekê Jî _Hilnebijêre" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "Hemûyan _Hilbijêrî" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Mezinahiya daxistinê: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Divê raweste, dibe ku ev hinekî demdijêj be." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Rojanekirin temam bû" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Rojanekirin têne venihartin." -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Guhertoya nû: %s (Mezinahî: %s)" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Guherto %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Mezinahî:%s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Belavkariya ku tu bikar tîne nayê destekirin" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -990,16 +1013,17 @@ msgstr "" "nestîne. Pergala xwe ya xebatê bilindî guhertoya Ubuntu Linuxê bike. Ji bo " "agahiyên berfireh malpera http://www.ubuntu.com ziyaret bike." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Weşana belavkariya nû dikare bigihêje '%s'" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Pêrista nivîsbariyê xera bûye" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1007,23 +1031,27 @@ msgid "" msgstr "" "Sazkirin an jî rakirina nivîsbariyê qet ne gengaz e. Ji kerema xwe berî her " "tiştî vê pirsgirêkê bi gerînendeyê pakêtan ya \"Synaptic\" and jî bi fermana " -"\"sudo apt-get install -f\" re di termînalê de çareser bike. \n" -" \n" +"\"sudo apt-get install -f\" re di termînalê de çareser bike.\r\n" +"\r\n" "— By ElîxanLoran on 2006-08-25 06:29:14 UTC (2 more)" +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 msgid "None" msgstr "Ne yek jî" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1361,193 +1389,237 @@ msgstr "Mezinahiyê paceyê" msgid "Configure the sources for installable software and updates" msgstr "Ji bo nivîsbarî û rojanekirinên têne sazkirin çavkaniyan veava bike" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Yên ji aliyê komekê ber çav hatiye derbaskirin" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Neazad (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdroma Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Neazad (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neazad (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdroma Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Bi piştgiriya fermî" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Rojanekirinên Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Yên ji aliyê koman ve lê tê nihêrîn (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ne-azad (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Bi piştgirtiya fermî" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Mafê kopîkrinê yê sînorkirî" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Rojanekirinên Ubuntu 4.10 yên Ewlekariyê" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Rojanekirinên Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Rojanekirinên Ewlekariyê" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1578,4 +1650,4 @@ msgstr "" #~ msgstr "Kanal" #~ msgid " " -#~ msgstr " " \ No newline at end of file +#~ msgstr " " diff --git a/po/lt.po b/po/lt.po index 4669a9cd..4ba906c9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:39+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"(n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" @@ -55,13 +55,15 @@ msgstr "Po mėnesio" msgid "After %s days" msgstr "Po %s dienų" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "Diegiami atnaujinimai" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,13 +124,12 @@ msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -166,6 +168,7 @@ msgstr "Negalima atnaujinti reikiamų metapaketų" 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:220 msgid "Could not calculate the upgrade" msgstr "Nepavyko paskaičiuoti atnaujinimo" @@ -181,6 +184,7 @@ msgstr "" "Iškilo neišsprendžiama problema apskaičiuojant atnaujinimą. Praneškite apie " "tai kaip klaidą." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Klaida autentikuojant keletą paketų" @@ -206,6 +210,7 @@ msgid "" msgstr "" "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 #, fuzzy msgid "Can't guess meta-package" @@ -274,6 +279,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Ar sukurti numatytųjų šaltinių sąrašą?" @@ -338,6 +344,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "At norite pradėti atnaujinimą?" @@ -413,6 +420,7 @@ msgstr "" "Išvalymo metu iškilo problema. Daugiau informacijos rasite žemiau esančiame " "pranešime. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Perkraunama sistema" @@ -423,6 +431,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -452,7 +461,7 @@ msgid "Invalid package information" msgstr "Netinkama paketo informacija" #: ../DistUpgrade/DistUpgradeControler.py:721 -#, fuzzy +#, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore.\n" @@ -480,6 +489,7 @@ msgstr "Ieškoma pasenusios programinės įrangos" msgid "System upgrade is complete." msgstr "Sistemos atnaujinimas baigtas." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -491,7 +501,7 @@ msgid "Fetching is complete" msgstr "Atnaujinimas užbaigtas" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" @@ -502,12 +512,13 @@ msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Atsiunčiamas failas %li iš %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Pritaikomi pakeitimai" @@ -523,8 +534,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -549,20 +561,21 @@ msgstr "Įvyko lemtinga klaida" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Praneškite apie tai kaip klaidą ir prie pranešimo pridėkite „/var/log/dist-" "upgrade.log“ bei „/var/log/dist-upgrade-apt.log“ bylas. Atnaujinimas dabar " "bus nutrauktas.\n" -"Jūsų originalioji „sources.list“ byla buvo išsaugota " -"„/etc/apt/sources.list.distUpgrade“ aplanke." +"Jūsų originalioji „sources.list“ byla buvo išsaugota „/etc/apt/sources.list." +"distUpgrade“ aplanke." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Bus pašalintas %s paketas." @@ -570,7 +583,7 @@ msgstr[1] "Bus pašalinti %s paketai." msgstr[2] "Bus pašalinta %s paketų." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Bus įdiegtas %s naujas paketas." @@ -578,7 +591,7 @@ msgstr[1] "Bus įdiegti %s nauji paketai." msgstr[2] "Bus įdiegta %s naujų paketų." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Bus atnaujintas %s paketas." @@ -586,7 +599,7 @@ msgstr[1] "Bus atnaujinti %s paketai." msgstr[2] "Bus atnaujinta %s paketų." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -610,8 +623,9 @@ msgstr "" "Norint išvengti duomenų praradimo turite užverti visas atvertas programas ir " "dokumentus." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Jūsų sistema atnaujinta" @@ -657,6 +671,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -678,6 +693,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -698,8 +714,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" msgstr "" -"Norėdami užbaigti atnaujinimą paleiskite operacijų sistemą iš " -"naujo" +"Norėdami užbaigti atnaujinimą paleiskite operacijų sistemą iš naujo" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -793,6 +809,7 @@ msgstr "Nepavyko atsiųsti laidos informacijos" msgid "Please check your internet connection." msgstr "Patikrinkite savo Interneto ryšį." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Nepavyko paleisti atnaujinimo priemonės" @@ -866,12 +883,12 @@ msgstr "" "serverio problema. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" @@ -894,15 +911,18 @@ msgid "" "Please check your Internet connection." msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -918,76 +938,79 @@ msgstr "Ubuntu 5.10 atnaujinimai" msgid "Distribution updates" msgstr "_Tęsti atnaujinimą" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Diegiami atnaujinimai" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Atsiunčiamas pakeitimų sąrašas..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Patikrinti" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Atsiuntimo dydis: %s" -#: ../UpdateManager/UpdateManager.py:617 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:633 +#, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Palaukite, tai gali užtrukti." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Atnaujinimas užbaigtas" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Diegiami atnaujinimai" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Nauja versija: %s (Dydis: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Versija %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Jūsų distribucija daugiau nebepalaikoma" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -997,16 +1020,17 @@ msgstr "" "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie " "atnaujinimą rasite http://www.ubuntu.com ." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Programinės įrangos turinys sugadintas" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1016,19 +1040,23 @@ 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" @@ -1398,211 +1426,253 @@ msgstr "" "Nustatykite programinės įrangos įdiegimo šaltinius bei atnaujinimus iš " "interneto" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 atnaujinimai" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Prižiūrima bendruomenės (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Ne Laisva (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 „Dapper Drake“" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Prižiūrima bendruomenės (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Prižiūrima bendruomenės (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Prižiūrima bendruomenės (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ne Laisva (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ne Laisva (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 „Dapper Drake“" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 „Breezy Badger“" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficialiai palaikoma" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 atnaujinimai" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 atnaujinimai" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 „Breezy Badger“" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Prižiūrima bendruomenės (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ne Laisva (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Apribotos autorinės teisės" +#. Description #: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 „Sarge“" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 „Sarge“ saugumo atnaujinimai" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian „Etch“ (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.lt.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian „Sid“ (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" -"Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis" +msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Su DFSG nesuderinama programinė įranga" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu" @@ -1626,7 +1696,8 @@ msgstr "Su DFSG nesuderinama programinė įranga" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Atnaujinama į Ubuntu 6.06 LTS" +#~ "Atnaujinama į Ubuntu 6.06 LTS" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1648,21 +1719,21 @@ msgstr "Su DFSG nesuderinama programinė įranga" #~ msgstr "" #~ "Ieškoma galimų atnaujinimų\n" #~ "\n" -#~ "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " -#~ "spragas bei suteikti naujas funkcijas." +#~ "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti " +#~ "saugumo spragas bei suteikti naujas funkcijas." #~ msgid "Oficially supported" #~ msgstr "Prižiūrima oficialiai" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Kai kuriems atnaujinimams reikia pašalinti programinę įrangą. Naudokitės " #~ "funkcija „Žymėti visus atnaujinimus“ paketų tvarkyklėje „Synaptic­“ arba " -#~ "terminale įvykdykite komandą „sudo apt-get dist-upgrade“, kad Jūsų sistema " -#~ "būtų visiškai atnaujinta." +#~ "terminale įvykdykite komandą „sudo apt-get dist-upgrade“, kad Jūsų " +#~ "sistema būtų visiškai atnaujinta." #~ msgid "The following updates will be skipped:" #~ msgstr "Šie atnaujinimai nebus įdiegti:" @@ -1740,8 +1811,8 @@ msgstr "Su DFSG nesuderinama programinė įranga" #, fuzzy #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Skanuojant Jūsų saugyklos informaciją nebuvo rasta tinkamo atnaujinimo " #~ "įrašo.\n" @@ -1753,17 +1824,19 @@ msgstr "Su DFSG nesuderinama programinė įranga" #~ msgstr "Skyriai:" #~ msgid "" -#~ "You need to manually reload the latest information about " -#~ "updates\n" +#~ "You need to manually reload the latest information about updates\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" -#~ "Jūs turite patys įkelti naujausią informaciją apie " -#~ "atnaujinimus\n" +#~ "Jūs turite patys įkelti naujausią informaciją apie atnaujinimus\n" #~ "\n" #~ "Jūsų sistema automatiškai neieško atnaujinimų. Šią elgseną galite " -#~ "konfigūruoti „Sistema“ -> „Administravimas“ -> „Programinės įrangos savybės“." +#~ "konfigūruoti „Sistema“ -> „Administravimas“ -> „Programinės įrangos " +#~ "savybės“." #~ msgid "Reload the latest information about updates" -#~ msgstr "Įkelti naujausią informaciją apie atnaujinimus" \ No newline at end of file +#~ msgstr "Įkelti naujausią informaciją apie atnaujinimus" diff --git a/po/lv.po b/po/lv.po index 874789b6..5b5b8394 100644 --- a/po/lv.po +++ b/po/lv.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: lp-upd-manager-lv\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 19:12+0000\n" "Last-Translator: mixat \n" "Language-Team: Latvian \n" @@ -58,6 +58,7 @@ msgstr "Pēc viena mēneša" msgid "After %s days" msgstr "Pēc %s dienām" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -65,6 +66,7 @@ msgstr "%s atjauninājumi" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -74,6 +76,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Galvenais serveris" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -123,8 +126,7 @@ msgid "Error removing the key" msgstr "Kļūda aizvācot atslēgu" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Jūsu izvēlēto atslēgu nevar noņemt. Lūdzu, ziņojiet par šo kļūdu." #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -161,6 +163,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Nevar aprēķināt atjauninājumu" @@ -173,6 +176,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -195,6 +199,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -254,6 +259,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -310,6 +316,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -372,6 +379,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -382,6 +390,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -432,6 +441,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -459,6 +469,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -474,6 +485,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -497,13 +509,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -546,8 +559,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -593,6 +607,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -612,6 +627,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -717,6 +733,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -806,14 +823,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -826,33 +846,35 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -860,73 +882,79 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 "Nekas" +#. 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" @@ -1250,187 +1278,232 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiāli atbalstītie" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Sabiedrības uzturētie (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Maksas (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Saistītie autortiesību" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #~ msgid "Select _All" -#~ msgstr "Izvēlēties _Visu" \ No newline at end of file +#~ msgstr "Izvēlēties _Visu" diff --git a/po/mk.po b/po/mk.po index 354dbda5..f9f85504 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:39+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -56,13 +56,15 @@ msgstr "После еден месец" msgid "After %s days" msgstr "После %s дена" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "Инсталирам надградби..." #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -125,8 +128,7 @@ msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." @@ -167,6 +169,7 @@ msgstr "Не може да се надградат потребните мета msgid "A essential package would have to be removed" msgstr "Важен пакет мора да се отстрани" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Не може да се одреди надградбата" @@ -182,6 +185,7 @@ msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Грешка при автентикација на некои пакети" @@ -209,6 +213,7 @@ msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Не може да се погоди мета пакетот" @@ -276,6 +281,7 @@ msgstr "" "изберете „Да“, ќе ги надградам '%s' до '%s' записи.\n" "Ако изберете „не“, надградбата ќе прекине." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 #, fuzzy msgid "Generate default sources?" @@ -289,8 +295,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"По скенирањето на вашиот 'sources.list' не е пронајден валиден запис за " -"'%s'.\n" +"По скенирањето на вашиот 'sources.list' не е пронајден валиден запис за '%" +"s'.\n" "\n" "Дали треба стандардните записи за '%s' да бидат додадени? Ако изберете „Не“, " "надградувањето ќе прекини." @@ -346,6 +352,7 @@ msgstr "" "на %s. Испразнете го ѓубрето и отстранете ги привремените пакети или " "поранешни инсталации со помош на 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Дали сакате да ја започнете надградбата?" @@ -413,6 +420,7 @@ msgstr "" "Се случи некој проблем при расчистувањето. Видете ја пораката подолу за " "повеќе информации. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -423,6 +431,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 #, fuzzy @@ -479,6 +488,7 @@ msgstr "Барам застарен софтвер" msgid "System upgrade is complete." msgstr "Надградбата на системот е завршена." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -506,6 +516,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 #, fuzzy msgid "Applying changes" @@ -522,6 +533,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -545,13 +557,14 @@ msgstr "Се случи фатална грешка" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -596,8 +609,9 @@ msgstr "" "За да спречите загуба на податоци, затворете ги сите отворени апликации и " "документи." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 #, fuzzy msgid "Your system is up-to-date" msgstr "Вашиот систем е надграден!" @@ -644,6 +658,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -665,6 +680,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -777,6 +793,7 @@ msgstr "Не можам да ги преземам белешките за из msgid "Please check your internet connection." msgstr "Ве молам проверете ја Вашата интернет врска." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Не можам да ја извршам алатката за надградба" @@ -880,15 +897,18 @@ msgstr "" "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет " "врска е активна." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Безбедносни надградби за Debian Stable" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -904,95 +924,99 @@ msgstr "Надградби за Убунту 5.10" msgid "Distribution updates" msgstr "Инсталирам надградби..." +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Верзија %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 -#, fuzzy +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 +#, fuzzy, python-format msgid "Download size: %s" msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:617 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:633 +#, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Инсталирам надградби..." msgstr[1] "Инсталирам надградби..." msgstr[2] "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Ве молам, почекајте, ова може да потрае." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Надградбата е завршена" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Проверувам за надградби..." -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Верзија %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуција повеќе не е поддржана" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" "Повеќе нема да добивате безбедносни поправки или критични надградби. " -"Надградете го системот на понова верзија на Ubuntu Linux. Видете на " -"http://www.ubuntu.com за повеќе информации за надградувањето." +"Надградете го системот на понова верзија на Ubuntu Linux. Видете на http://" +"www.ubuntu.com за повеќе информации за надградувањето." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Новото издание на дистрибуцијата, '%s', е достапно" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Индексот на софтвер е расипан" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1002,19 +1026,23 @@ msgstr "" "менаџерот за пакети Синаптик или прво извршете „sudo apt-ge 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" @@ -1277,8 +1305,8 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Внесете ја комплетната линија за APT складиштето за да го " -"додадете\n" +"Внесете ја комплетната линија за APT складиштето за да го додадете\n" "\n" "APT линијата го содржи типот, локацијата и содржината на складиштето за на " "пример \"deb http://ftp.debian.org sarge main\". Во документацијата " @@ -1368,209 +1396,253 @@ msgstr "Големината на прозорецот" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Надградби за Убунту 5.10" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Оддржувано од заедницата (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Додатен софтвер" +#. Description #: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Оддржувано од заедницата (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Оддржувано од заедницата (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Оддржувано од заедницата (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Неслободно (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Неслободно (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Безбедносни надградби за Убунту 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Надградби за Убунту 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Надградби за Убунту 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официјално поддржано" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Безбедносни надградби за Убунту 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Надградби за Убунту 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Надградби за Убунту 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Оддржувано од заедницата (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Неслободно (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Официјално поддржано" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Безбедносни надградби за Убунту 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Надградби за Убунту 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Надградби за Убунту 5.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Безбедносни надградби за Debian Stable" +#. Description #: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian Testing" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-компатибилен софтвер со неслободни зависности" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-компатибилен софтвер" @@ -1598,8 +1670,8 @@ msgstr "Не-DFSG-компатибилен софтвер" #, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" -#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " -#~ "како бубачка." +#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го " +#~ "ова како бубачка." #, fuzzy #~ msgid "Hide details" @@ -1705,13 +1777,13 @@ msgstr "Не-DFSG-компатибилен софтвер" #~ "Внесете ја комплетната линија за APT складиштето за да го " #~ "додадете\n" #~ "\n" -#~ "APT линијата го содржи типот, локацијата и содржината на складиштето за на " -#~ "пример \"deb http://ftp.debian.org sarge main\". Во документацијата " -#~ "можете да најдете детален опис на синтаксата." +#~ "APT линијата го содржи типот, локацијата и содржината на складиштето за " +#~ "на пример \"deb http://ftp.debian.org sarge main\". Во " +#~ "документацијата можете да најдете детален опис на синтаксата." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Додајте нова датотека со клуч во доверливиот привезок. Осигурајте се дека " #~ "сте го добиле клучот преку безбеден канал и дека му верувате на неговиот " @@ -1745,8 +1817,8 @@ msgstr "Не-DFSG-компатибилен софтвер" #~ msgstr "Отстрани го избраниот клуч од доверливиот привезок." #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Врати ги стандардните клучеви на дистрибуцијата. Ова нема да ги смени " #~ "клучевите инсталирани од корисникот." @@ -1781,8 +1853,8 @@ msgstr "Не-DFSG-компатибилен софтвер" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Достапни надградби\n" #~ "\n" @@ -1874,7 +1946,8 @@ msgstr "Не-DFSG-компатибилен софтвер" #~ msgstr[2] "Избравте %s пакети за надградба, со големина од %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Избравте %s од %s пакет за надградба, со големина од %s" #~ msgstr[1] "Избравте %s од %s пакети за надградба, со големина од %s" #~ msgstr[2] "Избравте %s од %s пакети за надградба, со големина од %s" @@ -1889,11 +1962,11 @@ msgstr "Не-DFSG-компатибилен софтвер" #~ msgstr "Веќе работи друг менаџер за пакети" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Можете да работите само со една апликација за менаџмент на пакети одеднаш. " -#~ "Ве молам прво исклучете ја оваа апликацијата." +#~ "Можете да работите само со една апликација за менаџмент на пакети " +#~ "одеднаш. Ве молам прво исклучете ја оваа апликацијата." #~ msgid "Updating package list..." #~ msgstr "Ја ажурирам листата на пакети..." @@ -1909,17 +1982,17 @@ msgstr "Не-DFSG-компатибилен софтвер" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Ве молам надградете до понова верзија на Убунту Линукс. Верзијата на која " -#~ "што работите повеќе нема да биде поддржана во смисол на безбедносни поправки " -#~ "и други технички надградби. Ве молам побарајте информации за надградба на " -#~ "http://www.ubuntulinux.org." +#~ "што работите повеќе нема да биде поддржана во смисол на безбедносни " +#~ "поправки и други технички надградби. Ве молам побарајте информации за " +#~ "надградба на http://www.ubuntulinux.org." #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Постои ново издание објавено под кодното име '%s'. Ве молам побарајте ги " #~ "инструкциите за надградба на http://www.ubuntulinux.org." @@ -1928,4 +2001,4 @@ msgstr "Не-DFSG-компатибилен софтвер" #~ msgstr "Никогаш пак не ја покажувај поракава" #~ msgid "Changes not found, the server may not be updated yet." -#~ msgstr "Не се пронајдени промени, серверот може да не е надграден сеуште." \ No newline at end of file +#~ msgstr "Не се пронајдени промени, серверот може да не е надграден сеуште." diff --git a/po/ms.po b/po/ms.po index 29126d96..71e50743 100644 --- a/po/ms.po +++ b/po/ms.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:40+0000\n" "Last-Translator: azlinux \n" "Language-Team: Malay \n" @@ -55,6 +55,7 @@ msgstr "Selepas satu bulan" msgid "After %s days" msgstr "Selepas %s hari" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,14 +124,13 @@ msgid "Error removing the key" msgstr "Ralat semasa mengeluarkan kekunci" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -167,6 +169,7 @@ msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan" 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:220 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menjangka penaikkan taraf" @@ -182,6 +185,7 @@ msgstr "" "Satu masaalah yang tidak dapat perbetulkan berlaku ketika menjangkakan taraf " "penaikkan. Sila laporkan ini sebagai ralat pepijat." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Ralat mengesahkan sesetengah pakej" @@ -209,6 +213,7 @@ msgstr "" "Pakej yang diperlukan tidak dapat dipasang. Sila laporkan ini sebagai ralat " "pepijat. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Pakej meta tidak dapat diduga." @@ -279,24 +284,25 @@ msgstr "" "mirror telah lapuk.\n" "\n" "Adakah anda tetap mahu menulis semula fail 'Sources.list' anda? Jika anda " -"memilih 'Ya' disini ianya akan mengemaskini kesemua kemasukan '%s' kepada " -"'%s'.\n" +"memilih 'Ya' disini ianya akan mengemaskini kesemua kemasukan '%s' kepada '%" +"s'.\n" "Jika anda memilih 'tidak' kemaskinian akan dibatalkan." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:267 -#, fuzzy +#, fuzzy, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" "\n" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Tiada kemasukan yang sah dijumpai untuk '%s' selepas mengimbas " -"'sources.list' anda.\n" +"Tiada kemasukan yang sah dijumpai untuk '%s' selepas mengimbas 'sources." +"list' anda.\n" "\n" "Adakah kemasukan default untuk '%s' perlu ditambah? Jika anda memilih " "'Tidak' kemaskinian akan dibatalkan." @@ -357,6 +363,7 @@ msgstr "" "cakera keras %s anda. Kosong dan padamkan pakej-pakej sementara dari " "pemasangan sebelum ini menggunakan 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Anda mahu mulakan penaikkan taraf?" @@ -429,6 +436,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -439,6 +447,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -492,6 +501,7 @@ msgstr "Mencari perisian yang lapuk" msgid "System upgrade is complete." msgstr "Naiktaraf sistem sempurna." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -519,6 +529,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -534,6 +545,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -557,15 +569,16 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Satu pakej yang perlu terpaksa dikeluarkan" @@ -601,11 +614,11 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." -msgstr "" -"Untuk mengelakkan kehilangan data tutup kesemua aplikasi dan dokumen." +msgstr "Untuk mengelakkan kehilangan data tutup kesemua aplikasi dan dokumen." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -651,6 +664,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -670,6 +684,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -776,6 +791,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -865,14 +881,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -885,106 +904,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1314,188 +1341,233 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #~ msgid "Some software no longer officially supported" -#~ msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." \ No newline at end of file +#~ msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." diff --git a/po/nb.po b/po/nb.po index a2e34ea5..9d1ae679 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:40+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" @@ -55,13 +55,15 @@ msgstr "Etter en måned" msgid "After %s days" msgstr "Etter %s dager" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "Installerer oppdateringer" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,9 +74,10 @@ msgstr "" msgid "Main server" msgstr "Hovedtjener" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 -#, fuzzy +#, fuzzy, python-format msgid "Server for %s" msgstr "Tjener for %s" @@ -128,13 +131,11 @@ msgid "Error removing the key" msgstr "Kunne ikke fjerne nøkkelen" #: ../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." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -173,6 +174,7 @@ msgstr "Kan ikke oppgradere nødvendige meta-pakker" 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:220 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" @@ -188,6 +190,7 @@ msgstr "" "Et uløselig problem oppstod ved forberedelse av oppgraderingen. Vennligst " "rapporter dette som en feil." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Kunne ikke autentisere noen pakker" @@ -214,6 +217,7 @@ msgid "" msgstr "" "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Kan ikke gjette på meta-pakke" @@ -287,6 +291,7 @@ msgstr "" "alle forekomster av '%s' endres til '%s'.\n" "Hvis du velger \"Nei\" vil oppgraderingen avbrytes." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Vil du opprette standardkilder?" @@ -360,6 +365,7 @@ msgstr "" "papirkurven og fjern midlertidige pakker fra tidligere installasjoner ved å " "bruke 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Ønsker du å starte oppgraderingen?" @@ -435,6 +441,7 @@ msgstr "" "Et problem oppstod under opprydningen. Vennligst se meldingen under for mer " "informasjon. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Gjenoppretter systemets originale tilstand" @@ -445,6 +452,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -474,7 +482,7 @@ msgid "Invalid package information" msgstr "Ugyldig pakkeinformasjon" #: ../DistUpgrade/DistUpgradeControler.py:721 -#, fuzzy +#, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore.\n" @@ -502,6 +510,7 @@ msgstr "Søker etter utdatert programvare" msgid "System upgrade is complete." msgstr "Systemoppgraderingen er fullført" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -513,23 +522,24 @@ msgid "Fetching is complete" msgstr "Oppdateringen er fullført" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Laster ned fil %li av %li med %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "Rundt %li minutter gjenstår" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Laster ned fil %li av %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Lagrer endringer" @@ -545,8 +555,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -571,39 +582,40 @@ msgstr "En uopprettelig feil oppsto" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Vennligst rapporter feilen og inkluder filene /var/log/dist-upgrade.log og " -"/var/log/dist-upgrade-apt.log i din melding. Oppgraderingen avbrytes nå.\n" +"Vennligst rapporter feilen og inkluder filene /var/log/dist-upgrade.log og /" +"var/log/dist-upgrade-apt.log i din melding. Oppgraderingen avbrytes nå.\n" "Din orginale sources.list ble lagret i /etc/apt/sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%s pakke vil bli fjernet." msgstr[1] "%s pakker vil bli fjernet" #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%s pakke vil bli installert." msgstr[1] "%s pakker vil bli installert." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakke vil bli oppgradert." msgstr[1] "%s pakker vil bli oppgradert." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -627,8 +639,9 @@ msgid "To prevent data loss close all open applications and documents." msgstr "" "For å forhindre tap av data bør du lukke alle åpne programmer og dokumenter." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Systemet ditt er oppdatert!" @@ -654,12 +667,12 @@ msgid "Upgrade %s" msgstr "Oppgradér %s" #: ../DistUpgrade/DistUpgradeView.py:27 -#, fuzzy +#, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Rundt %li dager, %li timer og %li minutter gjenstår" #: ../DistUpgrade/DistUpgradeView.py:29 -#, fuzzy +#, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Rundt %li timer og %li minutter gjenstår" @@ -674,6 +687,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -695,6 +709,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -808,6 +823,7 @@ msgstr "Kunne ikke laste ned utgivelsesnotatene" msgid "Please check your internet connection." msgstr "Vennligst kontrollér internettforbindelsen." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Kunne ikke kjøre oppgraderingsverktøyet" @@ -883,12 +899,12 @@ msgstr "" "nettverket eller med tjeneren. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Laster ned filen %li av %li med %s/s" @@ -913,16 +929,19 @@ msgstr "" "Kunne ikke laste ned listen med endringer. Vennligst kontrollér " "internettilkoblingen." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 #, fuzzy msgid "Recommended updates" msgstr "Anbefalte oppdateringer" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -938,94 +957,98 @@ msgstr "Ubuntu 5.10 Backports" msgid "Distribution updates" msgstr "_Gjenoppta oppgradering" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Installerer oppdateringer" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Laster ned listen med endringer..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "Sjekk" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Nedlastingsstørrelse: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Vennligst vent, dette kan ta litt tid." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Oppdateringen er fullført" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Sjekker for tilgjengelige oppdateringer" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Ny versjon: %s (Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" "Du vil ikke lenger motta flere sikkerhetsmessige eller kritiske " -"oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se " -"http://www.ubuntu.com for mer informasjon om oppgradering." +"oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www." +"ubuntu.com for mer informasjon om oppgradering." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Ny versjon \"%s\" er tilgjengelig" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Programvareoversikten er ødelagt." -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1058,23 @@ 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 "Ingen" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. 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" @@ -1418,206 +1445,250 @@ msgstr "Vindusstørrelsen" msgid "Configure the sources for installable software and updates" msgstr "Sett opp programvarekanaler og oppdateringer" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Oppdateringer" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Vedlikeholdt av miljøet (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Bidratt programvare" +#. Description #: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Vedlikeholdt av miljøet (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Vedlikeholdt av miljøet (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Oppdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Offisielt støttet" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Oppdateringer" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Noe programvare er ikke lenger offisielt støttet" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" sikkerhetsoppdateringer" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel programvare" @@ -1626,7 +1697,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "US eksport begrenset programvare" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Laster ned fil %li av %li ved ukjent hastighet" @@ -1650,7 +1720,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Oppgraderer til Ubuntu 6.06 LTS" +#~ "Oppgraderer til Ubuntu 6.06 LTS" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1671,26 +1742,25 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "" #~ "Analyserer systemet\n" #~ "\n" -#~ "Programvareoppdateringer reparerer feil, eliminerer sikkerhetsproblemer og " -#~ "gir deg ny funksjonalitet." +#~ "Programvareoppdateringer reparerer feil, eliminerer sikkerhetsproblemer " +#~ "og gir deg ny funksjonalitet." #~ msgid "Oficially supported" #~ msgstr "Offisielt støttet" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "Noen oppdateringer krever fjerning av andre programpakker. Bruk funksjonen " -#~ "\"Merk alle oppgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller " -#~ "kjør kommandoen \"sudo apt-get dist-upgrade\" i en terminal for å oppgradere " -#~ "systemet fullstendig." +#~ "Noen oppdateringer krever fjerning av andre programpakker. Bruk " +#~ "funksjonen \"Merk alle oppgraderinger\" i pakkehåndteringsprogrammet " +#~ "\"Synaptic\" eller kjør kommandoen \"sudo apt-get dist-upgrade\" i en " +#~ "terminal for å oppgradere systemet fullstendig." #~ msgid "The following updates will be skipped:" #~ msgstr "Følgende pakker vil ikke bli oppgradert:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Rundt %li sekunder gjenstår" @@ -1766,8 +1836,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "Backports for Ubuntu 6.06 LTS" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Fant ikke noen gyldig oppføring for oppgradering ved lesing av " #~ "arkivinformasjon.\n" @@ -1779,8 +1849,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "Du må oppdatere pakkelisten for at endringene skal tre i kraft. Vil du gjøre " -#~ "dette nå?" +#~ "Du må oppdatere pakkelisten for at endringene skal tre i kraft. Vil du " +#~ "gjøre dette nå?" #~ msgid "Sections" #~ msgstr "Seksjoner" @@ -1832,13 +1902,13 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "" #~ "Autentiseringsnøkler\n" #~ "\n" -#~ "Du kan legge til eller fjerne autentiseringsnøkler i dette vinduet. Nøkler " -#~ "gjør det mulig å kontrollere integriteten til programvare som blir lastet " -#~ "ned." +#~ "Du kan legge til eller fjerne autentiseringsnøkler i dette vinduet. " +#~ "Nøkler gjør det mulig å kontrollere integriteten til programvare som blir " +#~ "lastet ned." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Legg til en ny nøkkelfil til den sikre nøkkelringen. Vær sikker på at du " #~ "mottok nøkkelen over en sikker kanal og at du stoler på eieren. " @@ -1869,8 +1939,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "Maksimum størrelse i MB:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "Gjenoppret nøklene som kom med distri" #~ msgid "Set _maximum size for the package cache" @@ -1900,13 +1970,13 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Tilgjengelige oppdateringer\n" #~ "\n" -#~ "De følgende pakkene kan oppgraderes. Du kan oppgradere dem ved å trykke på " -#~ "«Installer»-knappen." +#~ "De følgende pakkene kan oppgraderes. Du kan oppgradere dem ved å trykke " +#~ "på «Installer»-knappen." #~ msgid "Cancel downloading the changelog" #~ msgstr "Avbryt nedlasting av endringslogg" @@ -1982,7 +2052,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr[1] "Du har valgt alle de %s oppdaterte pakkene, total størrelse %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Du har valgt %s av %s oppdaterte pakker, størrelse %s" #~ msgstr[1] "Du har valgt %s av de %s oppdaterte pakkene, total størrelse %s" @@ -1990,8 +2061,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "Oppdateringene blir tilført." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Du kan bare kjøre et pakkehåndteringsprogram samtidig. Lukk det andre " #~ "programmet først." @@ -2007,19 +2078,19 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Oppgrader til en nyere versjon av Ubuntu Linux. Versjonen du kjører får ikke " -#~ "sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. Se " -#~ "http://www.ubuntulinux.org for informasjon om oppgradering." +#~ "Oppgrader til en nyere versjon av Ubuntu Linux. Versjonen du kjører får " +#~ "ikke sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. " +#~ "Se http://www.ubuntulinux.org for informasjon om oppgradering." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Det er en ny versjon av Ubuntu tilgjengelig!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "En ny versjon med kodenavnet «%s» er tilgjengelig. Se http://www. " #~ "ubuntulinux.org/ for instruksjoner om oppgradering." @@ -2052,8 +2123,9 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Dette betyr at ved siden av å oppgradere pakkene kreves det ekstra handling " -#~ "(som å installere eller fjerne pakker). Bruk «Synaptic» eller «apt-get dist-" -#~ "upgrade» for å løse problemet." \ No newline at end of file +#~ "Dette betyr at ved siden av å oppgradere pakkene kreves det ekstra " +#~ "handling (som å installere eller fjerne pakker). Bruk «Synaptic» eller " +#~ "«apt-get dist-upgrade» for å løse problemet." diff --git a/po/ne.po b/po/ne.po index ac095915..57911ef0 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:40+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -57,13 +57,15 @@ msgstr "" msgid "After %s days" msgstr "" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -73,6 +75,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -125,11 +128,8 @@ msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." -msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस" +msgid "The key you selected could not be removed. Please report this as a bug." +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" #: ../SoftwareProperties/SoftwareProperties.py:1039 #, python-format @@ -165,6 +165,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -176,10 +177,9 @@ msgid "" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." -msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस" +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -201,10 +201,9 @@ msgstr "" msgid "" "It was impossible to install a required package. Please report this as a " "bug. " -msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस " +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -264,6 +263,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -321,6 +321,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -383,6 +384,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -393,6 +395,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 #, fuzzy @@ -410,9 +413,7 @@ msgid "" "Preparing the system for the upgrade failed. Please report this as a bug " "against the 'update-manager' package and include the files in /var/log/dist-" "upgrade/ in the bugreport." -msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस" +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" #: ../DistUpgrade/DistUpgradeControler.py:695 msgid "Updating repository information" @@ -449,6 +450,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -476,6 +478,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 #, fuzzy msgid "Applying changes" @@ -492,6 +495,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -515,13 +519,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -561,8 +566,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 #, fuzzy msgid "Your system is up-to-date" msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" @@ -609,6 +615,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -628,6 +635,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -735,6 +743,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -743,9 +752,7 @@ msgstr "" #, fuzzy msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug" -msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस" +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" #: ../UpdateManager/DistUpgradeFetcher.py:171 #, fuzzy @@ -830,18 +837,20 @@ msgstr "युबन्टुको एउटा नयाँ विमोचन msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." -msgstr "" -"परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" +msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -857,110 +866,118 @@ msgstr "युबन्टु ५.०४ अद्यावधिकहरु" msgid "Distribution updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "संस्करण %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 -#, fuzzy +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 +#, fuzzy, python-format msgid "Download size: %s" msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:617 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:633 +#, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै" msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "संस्करण %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "तपाईंको वितरण समर्थित छैन" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1221,12 +1238,11 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट " -"गर्नुहोस\n" +"तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस\n" "\n" -"एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि " -"\"deb http://ftp.debian.org sarge main\". तपाईंले मिसिलिकरण मा वाक्य " -"संरचनाको एउटा विस्तृत विवरण पाउन सक्नुहुन्छ" +"एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि \"deb " +"http://ftp.debian.org sarge main\". तपाईंले मिसिलिकरण मा वाक्य संरचनाको एउटा " +"विस्तृत विवरण पाउन सक्नुहुन्छ" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1310,211 +1326,256 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "योगदान गरिएको सफ्टवेयर" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "नन-फ्री (बहुभर्स)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "कार्यालय बाट समर्थित" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "कार्यालय बाट समर्थित" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "निषेधित प्रतिलिपि अधिकार" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1546,8 +1607,7 @@ msgstr "" #, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" -#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -#~ "दिनुहोस" +#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" #, fuzzy #~ msgid "Hide details" @@ -1603,11 +1663,11 @@ msgstr "" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप " -#~ "प्रति भण्डारण गरिएको छ. बचत गर्नुहोस. \n" +#~ "कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप प्रति " +#~ "भण्डारण गरिएको छ. बचत गर्नुहोस. \n" #~ "\n" -#~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची " -#~ "फेरि लोड गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?" +#~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची फेरि लोड " +#~ "गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?" #, fuzzy #~ msgid "Sections" @@ -1661,18 +1721,16 @@ msgstr "" #~ msgstr "" #~ "प्रमाणीकरण कुञ्जिहरु\n" #~ "\n" -#~ "तपाईंले यो संवाद भित्र प्रमाणीकरण कुञ्जिहरु थप्न र हटाउन सक्नुहुन्छ. तपाईंले " -#~ "डाउनलोड गरेको सफ्टवेयर को विश्वसनियता रुजु जाँच गर्नको लागि एउटा कुञ्जिले " -#~ "संभव पार्दछ" +#~ "तपाईंले यो संवाद भित्र प्रमाणीकरण कुञ्जिहरु थप्न र हटाउन सक्नुहुन्छ. तपाईंले डाउनलोड " +#~ "गरेको सफ्टवेयर को विश्वसनियता रुजु जाँच गर्नको लागि एउटा कुञ्जिले संभव पार्दछ" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "विश्वास गरिएको कुञ्जिरिंग मा एउटा नयाँ कुञ्जि फाइल थप्नुहोस. विश्वस्त " -#~ "हुनुहोस कि तपाईंले एउटा सुरक्षित माध्यम माथि कुञ्जि प्राप्त गर्नुभयो र तपाईं " -#~ "मालिकलाइ विश्वास गर्नुहुन्छ. " +#~ "विश्वास गरिएको कुञ्जिरिंग मा एउटा नयाँ कुञ्जि फाइल थप्नुहोस. विश्वस्त हुनुहोस कि तपाईंले " +#~ "एउटा सुरक्षित माध्यम माथि कुञ्जि प्राप्त गर्नुभयो र तपाईं मालिकलाइ विश्वास गर्नुहुन्छ. " #, fuzzy #~ msgid "Add repository..." @@ -1701,11 +1759,11 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "वितरण संग शिप गरिएको पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस. यसले " -#~ "प्रयोगकर्ता स्थापना गरिएको कुञ्जिहरु परिवर्तन गर्दैन" +#~ "वितरण संग शिप गरिएको पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस. यसले प्रयोगकर्ता " +#~ "स्थापना गरिएको कुञ्जिहरु परिवर्तन गर्दैन" #~ msgid "Set _maximum size for the package cache" #~ msgstr "प्याकेज क्यासको लागि अधिकतम आकार सेट गर्नुहोस" @@ -1732,13 +1790,13 @@ msgstr "" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "उपलब्ध अद्यावधिकहरु\n" #~ "\n" -#~ "निम्न प्याकेजहरु स्तरवृद्धि गर्न योग्य पाइयो. तपाईंले तिनिहरु लाइ स्थापना " -#~ "बटन प्रयोग गरेर स्तरवृद्धि गर्न सक्नुहुन्छ" +#~ "निम्न प्याकेजहरु स्तरवृद्धि गर्न योग्य पाइयो. तपाईंले तिनिहरु लाइ स्थापना बटन प्रयोग " +#~ "गरेर स्तरवृद्धि गर्न सक्नुहुन्छ" #~ msgid "Cancel downloading the changelog" #~ msgstr "परिवर्तनलग को डाउनलोड रद्द गर्नुहोस" @@ -1785,11 +1843,11 @@ msgstr "" #~ msgstr "स्तरवृद्धिहरु लागु हुँदैछन" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "तपाईंले उहि समयमा केवल एउटा प्याकेज व्यवस्थापन अनुप्रयोग चलाउन " -#~ "सक्नुहुन्छ.कृपया पहिला यो अन्य अनुप्रयोग बन्द गर्नुहोस" +#~ "तपाईंले उहि समयमा केवल एउटा प्याकेज व्यवस्थापन अनुप्रयोग चलाउन सक्नुहुन्छ.कृपया पहिला " +#~ "यो अन्य अनुप्रयोग बन्द गर्नुहोस" #~ msgid "Updating package list..." #~ msgstr "प्याकेज सुची स्तरवृद्धि गर्दै" @@ -1803,20 +1861,19 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "कृपया युबन्टु लिनक्स को नयाँ संस्करण मा स्तरवृद्धि गर्नुहोस. तपाईंले " -#~ "चलाइरहेको संस्करण ले सुरक्षा स्थिरहरु वा अन्य सूक्ष्म स्तरवृद्धिहरु प्राप्त " -#~ "गर्नेछैन. कृपया स्तरवृद्धि जानकारी को लागि http://www.ubuntulinux.org " -#~ "हेर्नुहोस" +#~ "कृपया युबन्टु लिनक्स को नयाँ संस्करण मा स्तरवृद्धि गर्नुहोस. तपाईंले चलाइरहेको संस्करण ले " +#~ "सुरक्षा स्थिरहरु वा अन्य सूक्ष्म स्तरवृद्धिहरु प्राप्त गर्नेछैन. कृपया स्तरवृद्धि जानकारी को " +#~ "लागि http://www.ubuntulinux.org हेर्नुहोस" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "एउटा नयाँ संकेतनाम '%s' भएको विमोचन उपलब्ध छ. कृपया स्तरवृद्धि निर्देशन को " -#~ "लागि://www.ubuntulinux.org/ हेर्नुहोस." +#~ "एउटा नयाँ संकेतनाम '%s' भएको विमोचन उपलब्ध छ. कृपया स्तरवृद्धि निर्देशन को लागि://" +#~ "www.ubuntulinux.org/ हेर्नुहोस." #~ msgid "Never show this message again" #~ msgstr "यो संदेश फेरि कहिले पनि नदेखाउनुहोस" @@ -1837,8 +1894,8 @@ msgstr "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" -#~ "यसको मतलब स्थापना गरिएका प्याकेजहरु को केहि निर्भरताहरु सन्तुष्ट छैनन. कृपया " -#~ "स्थिति ठीक गर्नको लागि \"साइनाप्टिक\" अथवा \"एपिटि-गेट\" प्रयोग गर्नुहोस" +#~ "यसको मतलब स्थापना गरिएका प्याकेजहरु को केहि निर्भरताहरु सन्तुष्ट छैनन. कृपया स्थिति " +#~ "ठीक गर्नको लागि \"साइनाप्टिक\" अथवा \"एपिटि-गेट\" प्रयोग गर्नुहोस" #~ msgid "It is not possible to upgrade all packages." #~ msgstr "सबै प्याकेजहरु स्तरवृद्धि गर्न संभव छैन" @@ -1846,12 +1903,12 @@ msgstr "" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "यसको मतलब प्याकेजहरु को उचित स्तरवृद्धि बाहेक केहि अधिक कार्य (जस्तै " -#~ "प्याकेजहरुको स्थापन र विस्थापन) आवश्यक छ. कृपया स्थिति ठीक गर्नको लागि " -#~ "साइनाप्टिक \"स्मार्ट स्तरवृद्धि\" अथवा \"एपिटि-गेट डिस्ट-स्तरवृद्धि\" प्रयोग " -#~ "गर्नुहोस" +#~ "यसको मतलब प्याकेजहरु को उचित स्तरवृद्धि बाहेक केहि अधिक कार्य (जस्तै प्याकेजहरुको स्थापन " +#~ "र विस्थापन) आवश्यक छ. कृपया स्थिति ठीक गर्नको लागि साइनाप्टिक \"स्मार्ट स्तरवृद्धि\" " +#~ "अथवा \"एपिटि-गेट डिस्ट-स्तरवृद्धि\" प्रयोग गर्नुहोस" #~ msgid "Initializing and getting list of updates..." -#~ msgstr "अद्यावधिकहरुको इनिसियलाइज गर्दै र सुची प्राप्त गर्दै" \ No newline at end of file +#~ msgstr "अद्यावधिकहरुको इनिसियलाइज गर्दै र सुची प्राप्त गर्दै" diff --git a/po/nl.po b/po/nl.po index b9ef144a..056cadef 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:40+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" @@ -54,13 +54,15 @@ msgstr "Na één maand" msgid "After %s days" msgstr "Na %s dagen" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "%s updates" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Hoofdserver" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,14 +127,13 @@ msgid "Error removing the key" msgstr "Fout bij het verwijderen van de sleutel" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -170,6 +172,7 @@ msgstr "Kan de vereiste meta-pakketten niet upgraden" 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:220 msgid "Could not calculate the upgrade" msgstr "Kan de vereisten voor de upgrade niet berekenen" @@ -185,6 +188,7 @@ msgstr "" "Tijdens het berekenen van de upgrade ontstond er een onoplosbaar probleem. " "Gelieve dit als fout te rapporteren." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Fout bij het bepalen van de echtheid van sommige pakketten" @@ -213,6 +217,7 @@ msgstr "" "Het was niet mogelijk om een vereist pakket te installeren. Gelieve dit als " "fout te rapporteren. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Kan het meta-pakket niet raden" @@ -239,7 +244,7 @@ msgid "Failed to add the CD" msgstr "Ophalen is mislukt" #: ../DistUpgrade/DistUpgradeControler.py:75 -#, fuzzy +#, fuzzy, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " "as a bug if this is a valid Ubuntu CD.\n" @@ -293,6 +298,7 @@ msgstr "" "zal overal '%s' worden vervangen door '%s'.\n" "Wanneer u 'Nee' kiest, zal de update worden geannuleerd." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "De standaard bronnenlijst genereren?" @@ -365,6 +371,7 @@ msgstr "" "vrijgemaakt. Leeg uw prullenbak en verwijder de tijdelijke pakketten van " "vorige installaties via 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Wilt u beginnen met de upgrade?" @@ -441,6 +448,7 @@ msgstr "" "Tijdens het opruimen deed zich een probleem voor. Zie onderstaand bericht " "voor meer informatie. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "De oorspronkelijke toestand wordt hersteld" @@ -451,6 +459,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -480,7 +489,7 @@ msgid "Invalid package information" msgstr "Ongeldige pakketinformatie" #: ../DistUpgrade/DistUpgradeControler.py:721 -#, fuzzy +#, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore.\n" @@ -508,6 +517,7 @@ msgstr "Zoeken naar overbodige software" msgid "System upgrade is complete." msgstr "Systeemupgrade is voltooid." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -519,23 +529,24 @@ msgid "Fetching is complete" msgstr "De update is voltooid" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Downloaden van bestand %li uit %li met %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "Ongeveer %li minuten resterend" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Downloaden van bestand %li uit %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Wijzigingen worden doorgevoerd" @@ -551,8 +562,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -577,41 +589,42 @@ msgstr "Er is een ernstige fout ontstaan" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Rapporteer dit als fout en voeg de bestanden /var/log/dist-upgrade.log en " -"/var/log/dist-upgrade-apt.log bij in uw foutrapport. De upgrade zal nu " +"Rapporteer dit als fout en voeg de bestanden /var/log/dist-upgrade.log en /" +"var/log/dist-upgrade-apt.log bij in uw foutrapport. De upgrade zal nu " "worden afgebroken.\n" -"Uw oorspronkelijke sources.list is opgeslagen in " -"/etc/apt/sources.list.distUpgrade." +"Uw oorspronkelijke sources.list is opgeslagen in /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Er zal %s pakket verwijderd worden." msgstr[1] "Er zullen %s pakketten verwijderd worden." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Er zal %s nieuw pakket geïnstalleerd worden." msgstr[1] "Er zullen %s nieuwe pakketten geïnstalleerd worden." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakket zal een upgrade krijgen" msgstr[1] "%s pakketten zullen een upgrade krijgen." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -636,8 +649,9 @@ msgstr "" "Sluit alle openstaande toepassingen en documenten om dataverlies te " "voorkomen." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Uw systeem is up-to-date" @@ -663,12 +677,12 @@ msgid "Upgrade %s" msgstr "%s upgraden" #: ../DistUpgrade/DistUpgradeView.py:27 -#, fuzzy +#, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Ongeveer %li dagen %li uur en %li minuten resterend" #: ../DistUpgrade/DistUpgradeView.py:29 -#, fuzzy +#, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Ongeveer %li uur en %li minuten resterend" @@ -683,6 +697,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -703,6 +718,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -815,6 +831,7 @@ msgstr "Kon de versie-informatie niet downloaden" msgid "Please check your internet connection." msgstr "Controleer uw internetverbinding." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Kon het upgrade-programma niet uitvoeren" @@ -889,12 +906,12 @@ msgstr "" "met het netwerk of de server. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Downloaden van bestand %li uit %li met %s/s" @@ -923,15 +940,18 @@ msgstr "" "Kon de lijst met wijzigingen niet downloaden. Controleer uw " "internetverbinding." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 veiligheidsupdates" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Aanbevolen updates" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -947,95 +967,99 @@ msgstr "Ubuntu 5.10 backports" msgid "Distribution updates" msgstr "_Upgrade hervatten" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Up_dates installeren" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versie %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Het overzicht van de wijzigingen wordt gedownload..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 #, fuzzy msgid "_Uncheck All" msgstr "Alles deselecteren" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Controleren" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Downloadgrootte: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Een ogenblik geduld, dit kan even duren." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "De update is voltooid" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Up_dates installeren" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Nieuwe versie: %s (Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Versie %s:" -#: ../UpdateManager/UpdateManager.py:816 -#, fuzzy +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 +#, fuzzy, python-format msgid "(Size: %s)" msgstr "(Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Uw distributie wordt niet langer ondersteund" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" "U zult niet langer veiligheidsupdates of kritieke updates krijgen. Voer een " -"upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie " -"http://www.ubuntu.com voor meer informatie over upgraden." +"upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu." +"com voor meer informatie over upgraden." -#: ../UpdateManager/UpdateManager.py:847 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:863 +#, fuzzy, python-format msgid "New distribution release '%s' is available" msgstr "De nieuwe Ubuntu-versie '%s' is beschikbaar" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Software-index is beschadigd" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1069,23 @@ 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 "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1332,8 +1360,8 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Voer de volledige APT-regel in van het kanaal dat u wilt " -"toevoegen\n" +"Voer de volledige APT-regel in van het kanaal dat u wilt toevoegen\n" "\n" "De APT-regel bevat het type, de locatie en de componenten van een kanaal, " "bijvoorbeeld: \"deb http://ftp.debian.org sarge main\"." @@ -1428,214 +1456,257 @@ msgstr "De venstergrootte" msgid "Configure the sources for installable software and updates" msgstr "Software-kanalen en internet-updates configureren" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 updates" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Door de gemeenschap beheerd (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 #, fuzzy msgid "Proprietary drivers for devices" msgstr "Proprietaire drivers voor apparaten" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Niet-vrij (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cd-rom met Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Door de gemeenschap beheerd (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Door de gemeenschap beheerd (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Door de gemeenschap beheerd (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Niet-vrij (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 #, fuzzy msgid "Proprietary drivers for devices " msgstr "Proprietaire drivers voor apparaten " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Niet-vrij (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 updates" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cd-rom met Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officieel ondersteund" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 updates" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Door de gemeenschap beheerd (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Niet-vrij (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cd-rom met Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Bepaalde software wordt niet meer officieel ondersteund" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Beperkte auteursrechten" +#. Description #: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 updates" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" veiligheidsupdates" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (onstabiel)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software niet compatibel met DFSG" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Downloaden van bestand %li uit %li, snelheid onbekend" @@ -1659,8 +1730,8 @@ msgstr "Software niet compatibel met DFSG" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Bezig met upgraden naar Ubuntu 6.06 " -#~ "LTS" +#~ "Bezig met upgraden naar Ubuntu " +#~ "6.06 LTS" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1681,8 +1752,8 @@ msgstr "Software niet compatibel met DFSG" #~ msgstr "" #~ "Uw system wordt gecontroleerd\n" #~ "\n" -#~ "Software-updates repareren fouten, verhelpen veiligheidsproblemen en leveren " -#~ "nieuwe mogelijkheden." +#~ "Software-updates repareren fouten, verhelpen veiligheidsproblemen en " +#~ "leveren nieuwe mogelijkheden." #, fuzzy #~ msgid "Oficially supported" @@ -1690,18 +1761,18 @@ msgstr "Software niet compatibel met DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Enkele updates vereisen dat andere softwarepaketten verwijderd worden. " -#~ "Gebruik de functie \"Pakketten bijwerken\" van het pakkettenbeheerprogramma " -#~ "\"Synaptic\" of gebruik: \"sudo apt-get dist-upgrade\" in een " -#~ "terminalvenster om uw systeem compleet bij te werken met de laatste updates." +#~ "Gebruik de functie \"Pakketten bijwerken\" van het " +#~ "pakkettenbeheerprogramma \"Synaptic\" of gebruik: \"sudo apt-get dist-" +#~ "upgrade\" in een terminalvenster om uw systeem compleet bij te werken met " +#~ "de laatste updates." #~ msgid "The following updates will be skipped:" #~ msgstr "De volgende updates worden overgeslagen:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Ongeveer %li seconden resterend" @@ -1765,7 +1836,7 @@ msgstr "Software niet compatibel met DFSG" #~ msgid "Ubuntu 6.06 LTS" #~ msgstr "" -#~ "Ubuntu 6.06 LTS \n" +#~ "Ubuntu 6.06 LTS\r\n" #~ "Ubuntu 6.06 updates" #~ msgid "Ubuntu 6.06 LTS Security Updates" @@ -1775,4 +1846,4 @@ msgstr "Software niet compatibel met DFSG" #~ msgstr "Ubuntu 6.06 LTS updates" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Ubuntu 6.06 LTS backports" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS backports" diff --git a/po/nn.po b/po/nn.po index cbe14d0e..b9646447 100644 --- a/po/nn.po +++ b/po/nn.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-06-19 15:52+0000\n" "Last-Translator: Willy André Bergstrøm \n" "Language-Team: Norwegian Nynorsk \n" @@ -55,6 +55,7 @@ msgstr "Etter ein månad" msgid "After %s days" msgstr "Etter %s dagar" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -123,8 +126,7 @@ msgid "Error removing the key" msgstr "Kunne ikkje fjerne nykjelen" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nykjelen du valde kan ikkje fjernast. Ver venleg å rapportere denne feilen." @@ -164,6 +166,7 @@ msgstr "Kan ikkje oppgradere naudsynte meta-pakkar" msgid "A essential package would have to be removed" msgstr "Ein naudsynt pakke vil måtte fjernast" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Kunne ikkje forberede oppgraderinga" @@ -176,6 +179,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Kunne ikkje autentisere somme pakkar" @@ -203,6 +207,7 @@ msgstr "" "Ein naudsynt pakke kunne ikkje installerast. Ver venleg og rapporter denne " "feilen. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Kan ikkje gjette på meta-pakke" @@ -269,6 +274,7 @@ msgstr "" "vil det oppdatere alle forekomstar av '%s' til '%s'.\n" "Om du veljer \"Nei\" vil oppgraderinga verte avbroten." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Vil du opprette standardkjelder?" @@ -281,8 +287,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Inga gyldig oppføring for \"%s\" vart funne under gjennomsøking av " -"\"sources.list\"-fila di.\n" +"Inga gyldig oppføring for \"%s\" vart funne under gjennomsøking av \"sources." +"list\"-fila di.\n" "\n" "Vil du legge till standard oppføring for \"%s\"? Om du vel \"Nei\" vil " "oppdateringa verte avbroten." @@ -334,6 +340,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -396,6 +403,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -406,6 +414,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -456,6 +465,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -483,6 +493,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -498,6 +509,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -521,13 +533,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -567,8 +580,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -614,6 +628,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -633,6 +648,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -738,6 +754,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -827,14 +844,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -847,106 +867,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1268,184 +1296,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/no.po b/po/no.po index fef7836f..78f578db 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-06 23:04+0200\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" diff --git a/po/oc.po b/po/oc.po index c290bdd4..19b234ac 100644 --- a/po/oc.po +++ b/po/oc.po @@ -8,10 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-09-30 00:43+0000\n" -"Last-Translator: Yannig MARCHEGAY (Kokoyaya) " -"\n" +"Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" "Language-Team: Occitan (post 1500) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,6 +56,7 @@ msgstr "Un mes aprèp" msgid "After %s days" msgstr "%s jorns aprèp" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "%s mesas a jorn" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Servidor principal" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -123,13 +126,12 @@ msgid "Error removing the key" msgstr "Error al moment de suprimir la clau" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -165,6 +167,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Impossible calcular la mesa a jorn" @@ -177,6 +180,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -199,6 +203,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -258,6 +263,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -314,6 +320,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Volètz començar la mesa a jorn ?" @@ -376,6 +383,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -386,6 +394,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -436,6 +445,7 @@ msgstr "Recèrca de logicials obsolets" msgid "System upgrade is complete." msgstr "La mesa a jorn del sistèma es acabada." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -463,6 +473,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Aplicacion dels cambis" @@ -478,6 +489,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -501,13 +513,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -530,7 +543,7 @@ msgstr[0] "" msgstr[1] "" #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -550,8 +563,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -597,6 +611,7 @@ msgid "%li seconds" msgstr "%li segondas" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -616,6 +631,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -722,6 +738,7 @@ msgstr "Impossible de telecargar las informacions de version" msgid "Please check your internet connection." msgstr "Verificatz vòstra connexion internet." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Impossible aviar l'esplech de mesa a jorn" @@ -811,14 +828,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -833,109 +853,117 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" msgid "Distribution updates" msgstr "Mesas a jorn per internet" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Mesas a jorn per internet" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Verificar" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Talha de la descarga : %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "La mesa a jorn es terminada" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Mesas a jorn per internet" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Version %s :" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Talha : %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1270,200 +1298,244 @@ msgstr "La talha de la fenèstra" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Pas liure (multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM que conten Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Pas liure (multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Pas liure (multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM que conten Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" +#. Description #: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Pas liure (multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Mesas a jorn de securitat per Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (en tèst)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (instable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1489,4 +1561,4 @@ msgstr "" #~ msgstr "_Personalisar" #~ msgid "Ubuntu 6.06 LTS" -#~ msgstr "Ubuntu 6.06 LTS" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS" diff --git a/po/pa.po b/po/pa.po index 92afc9b8..7b3574df 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:43+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -56,13 +56,15 @@ msgstr "" msgid "After %s days" msgstr "" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,8 +125,7 @@ msgid "Error removing the key" msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -160,6 +162,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -172,6 +175,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -194,6 +198,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -253,6 +258,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -309,6 +315,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -371,6 +378,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -381,6 +389,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -432,6 +441,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -459,6 +469,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -474,6 +485,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -497,13 +509,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -543,8 +556,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -590,6 +604,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -609,6 +624,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -718,6 +734,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -809,15 +826,18 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -832,108 +852,116 @@ msgstr "" msgid "Distribution updates" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:633 +#, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1271,184 +1299,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1501,4 +1574,4 @@ msgstr "" #, fuzzy #~ msgid "Sections:" -#~ msgstr "ਵੇਰਵਾ" \ No newline at end of file +#~ msgstr "ਵੇਰਵਾ" diff --git a/po/pl.po b/po/pl.po index bdff1fad..cbd79878 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-09-02 19:44+0000\n" "Last-Translator: White Eagle \n" "Language-Team: Polish \n" @@ -55,6 +55,7 @@ msgstr "Po miesiącu" msgid "After %s days" msgstr "Po %s dniach" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "%s aktualizacji" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Serwer główny" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 @@ -164,6 +166,7 @@ msgstr "Nie można zaktualizować wymaganych meta-pakietów" 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:220 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" @@ -180,6 +183,7 @@ msgstr "" "Prosimy zgłosić błąd pakietu \"update-manager\" dołączając w zgłoszeniu " "pliki z folderu /var/log/dist-upgrade/ ." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Błąd podczas uwierzytelniania niektórych pakietów" @@ -203,9 +207,9 @@ msgstr "Nie można zainstalować \"%s\"" 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. " +msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów" @@ -282,10 +286,11 @@ msgstr "" "lustrzanego dla aktualizacji. To może się zdarzyć, jeśli używasz wewnętrzny " "serwer lustrzany lub informacje o serwerze są nieaktualne.\n" "\n" -"Czy chcesz przepisać plik \"sources.list\" mimo tego? Jeśli wybierzesz " -"\"Tak\" wpisy \"%s\" do \"%s\" zostaną zaktualizowane.\n" +"Czy chcesz przepisać plik \"sources.list\" mimo tego? Jeśli wybierzesz \"Tak" +"\" wpisy \"%s\" do \"%s\" zostaną zaktualizowane.\n" "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Wygenerować domyślne źródła?" @@ -298,8 +303,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Po zeskanowaniu \"sources.list\" nie odnaleziono poprawnego wpisu dla " -"\"%s\".\n" +"Po zeskanowaniu \"sources.list\" nie odnaleziono poprawnego wpisu dla \"%s" +"\".\n" "\n" "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" " "aktualizacja zostanie anulowana." @@ -327,8 +332,8 @@ msgid "" "synaptic." msgstr "" "Niektóre kanały osób trzecich w pliku sources.list zostały wyłączone. Możesz " -"ponownie je włączyć po aktualizacji używając narzędzia \"software-" -"properties\" lub programu Synaptic." +"ponownie je włączyć po aktualizacji używając narzędzia \"software-properties" +"\" lub programu Synaptic." #: ../DistUpgrade/DistUpgradeControler.py:358 msgid "Error during update" @@ -353,10 +358,11 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"Aktualizacja zostanie zatrzymana. Proszę zwolnić co najmniej %s miejsca na " -"%s. Opróżnij kosz i usuń tymczasowe pakiety z poprzednich instalacji " -"używając \"sudo apt-get clean\"." +"Aktualizacja zostanie zatrzymana. Proszę zwolnić co najmniej %s miejsca na %" +"s. Opróżnij kosz i usuń tymczasowe pakiety z poprzednich instalacji używając " +"\"sudo apt-get clean\"." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Czy chcesz rozpocząć aktualizację?" @@ -428,6 +434,7 @@ msgstr "" "Wystąpił problem podczas oczyszczania. Więcej informacji znajduje się w " "poniższych wiadomościach. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Przywracanie pierwotnego stanu systemu" @@ -438,6 +445,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -473,8 +481,8 @@ msgid "" msgstr "" "Po aktualizacji informacji o pakietach niezbędny pakiet \"%s\" nie może " "zostać odnaleziony.\n" -"To wskazuje na poważny problem, proszę zgłosić błąd pakietu \"update-" -"manager\" i dołączyć pliki zawarte w /var/log/dist-upgrade/ w raporcie." +"To wskazuje na poważny problem, proszę zgłosić błąd pakietu \"update-manager" +"\" i dołączyć pliki zawarte w /var/log/dist-upgrade/ w raporcie." #: ../DistUpgrade/DistUpgradeControler.py:733 msgid "Asking for confirmation" @@ -492,6 +500,7 @@ msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania" msgid "System upgrade is complete." msgstr "Aktualizacja systemu zakończona powodzeniem." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -519,6 +528,7 @@ msgstr "Pobieranie pliku %li z %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Zatwierdzanie zmian" @@ -536,6 +546,7 @@ msgstr "" "Aktualizacja zostaje przerwana. Prosimy o wysłanie raportu o błędzie pakietu " "'update-manager' dołączając pliki w /var/log/dist-upgrade/." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -561,18 +572,19 @@ msgstr "Wystąpił błąd krytyczny" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Prosimy o wysłanie raportu o tym błędzie i dołączeniu plików /var/log/dist-" "upgrade/main.log i /var/log/dist-upgrade/apt.log w swoim raporcie. " "Aktualizacja zostaje przerwana.\n" -"Pierwotny plik sources.list został zapisany w " -"/etc/apt/sources.list.distUpgrade." +"Pierwotny plik sources.list został zapisany w /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -622,8 +634,9 @@ msgstr "" "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i " "dokumenty." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Twój system jest w pełni zaktualizowany" @@ -669,6 +682,7 @@ msgid "%li seconds" msgstr "%li sekund" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -690,6 +704,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -800,6 +815,7 @@ msgstr "Pobranie informacji o wydaniu było niemożliwe" msgid "Please check your internet connection." msgstr "Proszę sprawdzić swoje połączenie internetowe." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Nie można było uruchomić narzędzia aktualizacji" @@ -833,8 +849,7 @@ msgstr "Pobranie nie powiodło się" #: ../UpdateManager/DistUpgradeFetcher.py:209 msgid "Fetching the upgrade failed. There may be a network problem. " -msgstr "" -"Pobranie aktualizacji nie powiodło się. To może być problem sieciowy. " +msgstr "Pobranie aktualizacji nie powiodło się. To może być problem sieciowy. " #: ../UpdateManager/DistUpgradeFetcher.py:214 msgid "Failed to extract" @@ -896,14 +911,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Ważne aktualizacje bezpieczeństwa" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Aktualizacje polecane" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Aktualizacje proponowane" @@ -916,33 +934,35 @@ msgstr "Backporty" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Inne aktualizacje" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Wersja %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "Odznacz wszystkie" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "Zaznacz wszystkie" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Rozmiar do pobrania: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -950,38 +970,39 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s" msgstr[1] "Ilość dostępnych aktualizacji: %s" msgstr[2] "Ilość dostępnych aktualizacji: %s" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Proszę czekać, to może chwilę potrwać." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Aktualizacja została ukończona." -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Sprawdzanie dostępności aktualizacji" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Wersja %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Rozmiar: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Twoja dystrybucja nie jest już wspierana" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -991,16 +1012,17 @@ msgstr "" "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. " "Odwiedź http://www.ubuntu.com po więcej informacji." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Nowe wydanie dystrybucji \"%s\" jest dostępne" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Spis oprogramowania jest uszkodzony" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1010,19 +1032,23 @@ 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 "Brak" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1042,8 +1068,7 @@ msgstr "Utrzymuj system w pełni zaktualizowany" #: ../data/glade/UpdateManager.glade.h:5 msgid "Not all updates can be installed" -msgstr "" -"Nie wszystkie aktualizacje mogą zostać zainstalowane" +msgstr "Nie wszystkie aktualizacje mogą zostać zainstalowane" #: ../data/glade/UpdateManager.glade.h:6 msgid "Starting update manager" @@ -1379,190 +1404,233 @@ msgstr "Rozmiar okna" msgid "Configure the sources for installable software and updates" msgstr "Konfiguruj źródła pakietów oprogramowania i aktualizacji" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Pod opieką społeczeństwa" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Własnościowe sterowniki dla urządzeń" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Ograniczone oprogramowanie" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD-ROM z Ubuntu 6.10 \"Edgy Eft\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Obsługiwane przez społeczność (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Oprogramowanie Open Source pod opieką społeczeństwa" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Sterowniki nie-wolnodostępne" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Własnościowe sterowniki dla urządzeń " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Oprogramowanie nie-wolnodostępne (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD-ROM z Ubuntu 6.06 LTS \"Dapper Drake\"" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Aktualizacje backportowane" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Wspierane oficjalnie" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Aktualizacje dla Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Aktualizacje dla Ubuntu 5.04 (backporty)" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu·4.10·\"Warty·Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Utrzymywane przez społeczność (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Już nieobsługiwane" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "O ograniczonych prawach kopiowania" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Aktualizacje dla Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Aktualizacje dla Ubuntu 4.10 (backporty)" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Debiana 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (wersja testowa)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (wersja unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Oprogramowanie niekompatybilne z DFSG." -#, python-format #~ msgid "" #~ "Error scaning the CD\n" #~ "\n" @@ -1573,21 +1641,22 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "%s" #~ msgid "" -#~ "A unresolvable problem occured while calculating the upgrade. Please report " -#~ "this as a bug. " +#~ "A unresolvable problem occured while calculating the upgrade. Please " +#~ "report this as a bug. " #~ msgstr "" -#~ "Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji. Proszę " -#~ "zgłosić to jako błąd. " +#~ "Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji. " +#~ "Proszę zgłosić to jako błąd. " #~ 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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." #~ msgstr "" -#~ "System nie zawiera żadnego z pakietów: ubuntu-desktop, kubuntu-desktop lub " -#~ "edubuntu-desktop. Nie jest możliwe określenie używanej wersji Ubuntu.\n" +#~ "System nie zawiera żadnego z pakietów: ubuntu-desktop, kubuntu-desktop " +#~ "lub edubuntu-desktop. Nie jest możliwe określenie używanej wersji " +#~ "Ubuntu.\n" #~ " Przed kontynuowaniem proszę zainstalować jeden z powyższych pakietów." #~ msgid "" @@ -1600,8 +1669,8 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "lub za pomocą Synaptic." #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "was run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery was run (dpkg --configure -a)." #~ msgstr "" #~ "Aktualizacja została przerwana. System może znajdować się w stanie " #~ "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --" @@ -1623,7 +1692,6 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "Jeśli nie masz włączonego \"universe\" w następnym kroku zostanie " #~ "zasugerowane ich usunięcie. " -#, python-format #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore.\n" @@ -1633,37 +1701,30 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "być odnaleziony.\n" #~ "To wskazuje na poważny problem, proszę zgłosić ten błąd." -#, python-format #~ msgid "About %li days %li hours %li minutes remaining" #~ msgstr "Około %li dni %li godzin %li minut pozostało" -#, python-format #~ msgid "About %li hours %li minutes remaining" #~ msgstr "Około %li godzin %li minut pozostało" -#, python-format #~ msgid "About %li minutes remaining" #~ msgstr "Około %li minut pozostało" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Około %li sekund pozostało" #~ msgid "Download is complete" #~ msgstr "Pobieranie zostało zakończone." -#, python-format #~ msgid "Downloading file %li of %li at %s/s" #~ msgstr "Pobieranie pliku %li z %li z prędkością %s/s" -#, python-format #~ msgid "Downloading file %li of %li" #~ msgstr "Pobieranie pliku %li z %li" #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "Aktualizacja została przerwana. Proszę zgłosić ten błąd." -#, python-format #~ msgid "" #~ "Replace configuration file\n" #~ "'%s'?" @@ -1672,42 +1733,40 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "\"%s\"?" #~ msgid "" -#~ "Please report this as a bug and include the files /var/log/dist-upgrade.log " -#~ "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" +#~ "Please report this as a bug and include the files /var/log/dist-upgrade." +#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts " +#~ "now.\n" #~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." #~ msgstr "" -#~ "Proszę zgłosić ten błąd i w raporcie dołączyć pliki ~/dist-upgrade.log oraz " -#~ "~/dist-upgrade-apt.log. Aktualizacja została przerwana.\n" -#~ "Pierwotny plik sources.list został zapisany w " -#~ "/etc/apt/sources.list.distUpgrade." +#~ "Proszę zgłosić ten błąd i w raporcie dołączyć pliki ~/dist-upgrade.log " +#~ "oraz ~/dist-upgrade-apt.log. Aktualizacja została przerwana.\n" +#~ "Pierwotny plik sources.list został zapisany w /etc/apt/sources.list." +#~ "distUpgrade." -#, python-format #~ msgid "%s package is going to be removed." #~ msgid_plural "%s packages are going to be removed." #~ msgstr[0] "%s pakiet zostanie usunięty." #~ msgstr[1] "%s pakiety zostaną usunięte." #~ msgstr[2] "%s pakietów zostanie usuniętych." -#, python-format #~ msgid "%s new package is going to be installed." #~ msgid_plural "%s new packages are going to be installed." #~ msgstr[0] "%s nowy pakiet zostanie zainstalowany." #~ msgstr[1] "%s nowe pakiety zostaną zainstalowane." #~ msgstr[2] "%s nowy pakietów zostanie zainstalowane." -#, python-format #~ msgid "%s package is going to be upgraded." #~ msgid_plural "%s packages are going to be upgraded." #~ msgstr[0] "%s pakiet zostanie zaktualizowany." #~ msgstr[1] "%s pakiety zostaną zaktualizowane." #~ msgstr[2] "%s pakietów zostanie zaktualizowanych." -#, python-format #~ msgid "You have to download a total of %s." #~ msgstr "Konieczne pobranie ogółem %s." #~ msgid "" -#~ "The upgrade can take several hours and cannot be canceled at any time later." +#~ "The upgrade can take several hours and cannot be canceled at any time " +#~ "later." #~ msgstr "" #~ "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana." @@ -1729,17 +1788,15 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgstr "Aktualizacja Ubuntu" #~ msgid "" -#~ "Verfing the upgrade failed. There may be a problem with the network or with " -#~ "the server. " +#~ "Verfing the upgrade failed. There may be a problem with the network or " +#~ "with the server. " #~ msgstr "" -#~ "Weryfikacja aktualizacji nie powiodła się. To może być problem sieciowy lub " -#~ "z serwerem. " +#~ "Weryfikacja aktualizacji nie powiodła się. To może być problem sieciowy " +#~ "lub z serwerem. " -#, python-format #~ msgid "Downloading file %li of %li with %s/s" #~ msgstr "Pobieranie pliku %li z %li z prędkością %s/s" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" @@ -1773,13 +1830,13 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Niektóre aktualizacje wymagają dalszego usuwania oprogramowania. Aby " -#~ "ukończyć proces aktualizacji użyj opcji \"Zaznacz wszystko do aktualizacji\" " -#~ "w Mendżerze Pakietów Synaptic albo uruchom \"sudo apt-get dist-upgrade\" w " -#~ "terminalu." +#~ "ukończyć proces aktualizacji użyj opcji \"Zaznacz wszystko do aktualizacji" +#~ "\" w Mendżerze Pakietów Synaptic albo uruchom \"sudo apt-get dist-upgrade" +#~ "\" w terminalu." #~ msgid "The following updates will be skipped:" #~ msgstr "Następujące pakiety zostaną pominięte:" @@ -1793,17 +1850,18 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "Select _All" #~ msgstr "Zaznacz w_szystkie" -#, python-format #~ msgid "From version %s to %s" #~ msgstr "Z wersji %s do %s" #~ msgid "" #~ "You must check for updates manually\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" -#~ "Wymagane jest ręczne sprawdzenie dostępności aktualizacji\n" +#~ "Wymagane jest ręczne sprawdzenie dostępności aktualizacji\n" #~ "\n" #~ "System nie sprawdza dostępności aktualizacji automatycznie. To ustawienie " #~ "można to zmienić w \"System\" -> \"Administracja\" -> \"Software " @@ -1817,8 +1875,8 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgstr "" #~ "Sprawdzanie systemu\n" #~ "\n" -#~ "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " -#~ "bezpieczeństwa i dostarczyć nowe funkcje." +#~ "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe " +#~ "punkty bezpieczeństwa i dostarczyć nowe funkcje." #~ msgid "Cancel _Download" #~ msgstr "_Przerwij pobieranie" @@ -1826,8 +1884,8 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "" #~ "The channel information is out-of-date\n" #~ "\n" -#~ "You have to reload the channel information to install software and updates " -#~ "from newly added or changed channels. \n" +#~ "You have to reload the channel information to install software and " +#~ "updates from newly added or changed channels. \n" #~ "\n" #~ "You need a working internet connection to continue." #~ msgstr "" @@ -1839,31 +1897,33 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "Aby kontynuować potrzebne jest działające połączenie internetowe." #~ msgid "" -#~ "Enter the complete APT line of the source that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the source that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a source, for " #~ "example \"deb http://ftp.debian.org sarge main\"." #~ msgstr "" -#~ "Wpisz pełny wiersz APT opisujący kanał który chcesz dodać\n" +#~ "Wpisz pełny wiersz APT opisujący kanał który chcesz dodać\n" #~ "\n" -#~ "Wiersz APT zawiera typ, lokalizację i zawartość kanału, przykładowo \"deb " -#~ "http://ftp.debian.org sarge main\"." +#~ "Wiersz APT zawiera typ, lokalizację i zawartość kanału, przykładowo " +#~ "\"deb http://ftp.debian.org sarge main\"." #~ msgid "" #~ "If automatic checking for updates is disabeld, you have to reload the " -#~ "channel list manually. This option allows to hide the reminder shown in this " -#~ "case." +#~ "channel list manually. This option allows to hide the reminder shown in " +#~ "this case." #~ msgstr "" -#~ "Jeśli automatycznie sprawdzanie dostępności aktualizacji jest wyłączone to " -#~ "koniecznie jest ręczne wczytanie listy kanałów. Ta opcja pozwala na ukrycie " -#~ "pokazywanego w tym przypadku.powiadamiania." +#~ "Jeśli automatycznie sprawdzanie dostępności aktualizacji jest wyłączone " +#~ "to koniecznie jest ręczne wczytanie listy kanałów. Ta opcja pozwala na " +#~ "ukrycie pokazywanego w tym przypadku.powiadamiania." #~ msgid "" #~ "Stores the state of the expander that contains the list of changs and the " #~ "description" #~ msgstr "" -#~ "Zapamiętuje stan obszaru z listą zmian i opisem poszczególnych aktualizacji" +#~ "Zapamiętuje stan obszaru z listą zmian i opisem poszczególnych " +#~ "aktualizacji" #~ msgid "" #~ "OpenSource software that is officially supported by Canonical Ltd. (main)" @@ -1876,7 +1936,8 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "Proprietary drivers for devices (restricted) " #~ msgstr "Własnościowe sterowniki dla urządzeń (restricted) " -#~ msgid "Software that is restricted by copyright or legal issues (multiverse)" +#~ msgid "" +#~ "Software that is restricted by copyright or legal issues (multiverse)" #~ msgstr "" #~ "Oprogramowanie ograniczone prawami kopiowania lub wątpliowściami prawnymi " #~ "(multiverse)" @@ -1953,8 +2014,8 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgstr "Aktualizacje dla Ubuntu 6.06 LTS (Backporty)" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Podczas skanowania informacji o repozytoriach nie odnaleziono poprawnych " #~ "wpisów potrzebnych do aktualizacji.\n" @@ -2021,13 +2082,13 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Dostępne aktualizacje\n" #~ "\n" -#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować klikając " -#~ "przycisk Instaluj." +#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować " +#~ "klikając przycisk Instaluj." #~ msgid "Repository" #~ msgstr "Repozytorium" @@ -2047,20 +2108,21 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgstr "" #~ "Klucze autentykacyjne\n" #~ "\n" -#~ "W tym oknie dialogowym można dodawać i usuwać klucze autentykacyjne. Klucz " -#~ "pozwala na sprawdzenie integralności oprogramowania które jest pobierane z " -#~ "sieci." +#~ "W tym oknie dialogowym można dodawać i usuwać klucze autentykacyjne. " +#~ "Klucz pozwala na sprawdzenie integralności oprogramowania które jest " +#~ "pobierane z sieci." #~ msgid "A_uthentication" #~ msgstr "A_utentykacja" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Dodaje plik z kluczem do listy zaufanych kluczy. Należy upewnić sie, że " -#~ "został otrzymany bezpiecznym kanałem oraz, że pochodzi z zaufanego źródła. " +#~ "został otrzymany bezpiecznym kanałem oraz, że pochodzi z zaufanego " +#~ "źródła. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "Usuwaj _tymczasowe pliki z pakietami" @@ -2082,11 +2144,11 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Przywraca domyślne klucze rozprowadzane wraz z dystrybucją. Nie wpływa to na " -#~ "klucze zainstalowane przez użytkownika." +#~ "Przywraca domyślne klucze rozprowadzane wraz z dystrybucją. Nie wpływa to " +#~ "na klucze zainstalowane przez użytkownika." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Maksymalny rozmiar pamięci podręcznej" @@ -2110,8 +2172,9 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" -#~ "Oznacza to, że pewne zależności instalowanych pakietów nie są spełnione.Aby " -#~ "rozwiązać problem proszę skorzystać z programu \"Synaptic\" lub \"apt-get\"." +#~ "Oznacza to, że pewne zależności instalowanych pakietów nie są spełnione." +#~ "Aby rozwiązać problem proszę skorzystać z programu \"Synaptic\" lub \"apt-" +#~ "get\"." #~ msgid "It is not possible to upgrade all packages." #~ msgstr "Nie można uaktualnić wszystkich pakietów" @@ -2119,12 +2182,13 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "Oznacza to, że do aktualizacji wymagane sa dodatkowe działania (takie jak " -#~ "dodanie lub usunięcie pakietów). Aby rozwiązać problem proszę skorzystać z " -#~ "funkcji \"sprytnej aktualizacji\" programu Synaptic lub wykonać polecenie " -#~ "\"apt-get dist-upgrade\"." +#~ "dodanie lub usunięcie pakietów). Aby rozwiązać problem proszę skorzystać " +#~ "z funkcji \"sprytnej aktualizacji\" programu Synaptic lub wykonać " +#~ "polecenie \"apt-get dist-upgrade\"." #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" @@ -2135,11 +2199,11 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgstr "Aktualizacje są teraz instalowane." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. Należy " -#~ "najpierw zamknąć aplikację która teraz działa." +#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. " +#~ "Należy najpierw zamknąć aplikację która teraz działa." #~ msgid "Updating package list..." #~ msgstr "Aktualizacja listy pakietów..." @@ -2149,13 +2213,14 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Proszę uaktualnić dystrybucję do nowszej wersji Ubuntu Linux. Obecna wersja " -#~ "nie będzie już otrzymywać uaktualnień bezpieczeństwa oraz innych krytycznych " -#~ "uaktualnień. Informacje o tym jak uaktualnić dystrybucję można znaleźć na " -#~ "stronie http://www.ubuntulinux.org (Witryna w języku angielskim)" +#~ "Proszę uaktualnić dystrybucję do nowszej wersji Ubuntu Linux. Obecna " +#~ "wersja nie będzie już otrzymywać uaktualnień bezpieczeństwa oraz innych " +#~ "krytycznych uaktualnień. Informacje o tym jak uaktualnić dystrybucję " +#~ "można znaleźć na stronie http://www.ubuntulinux.org (Witryna w języku " +#~ "angielskim)" #, fuzzy #~ msgid "There is a new release of Ubuntu available!" @@ -2166,11 +2231,11 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. Należy " -#~ "najpierw zamknąć aplikację która teraz działa." +#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. " +#~ "Należy najpierw zamknąć aplikację która teraz działa." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Inicjowanie i pobieranie listy aktualizacji..." @@ -2208,13 +2273,13 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Dostępne aktualizacje\n" #~ "\n" -#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować klikając " -#~ "przycisk Instaluj." +#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować " +#~ "klikając przycisk Instaluj." #~ msgid "CD disk" -#~ msgstr "Płyta CD" \ No newline at end of file +#~ msgstr "Płyta CD" diff --git a/po/pt.po b/po/pt.po index ec8da300..227583eb 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-06 18:27+0000\n" "Last-Translator: Susana \n" "Language-Team: Ubuntu Portuguese Team \n" @@ -53,6 +53,7 @@ msgstr "Após um mês" msgid "After %s days" msgstr "Depois de %s dias" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -60,6 +61,7 @@ msgstr "actualizações do %s" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -69,6 +71,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Servidor principal" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "Erro ao remover a chave" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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." @@ -165,6 +167,7 @@ msgstr "Não foi possível actualizar os meta-pacotes necessários" 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:220 msgid "Could not calculate the upgrade" msgstr "Impossível de calcular a actualização" @@ -181,6 +184,7 @@ msgstr "" "Por favor reporte este erro no pacote 'update-manager' e inclua os ficheiros " "contidos em /var/log/dist-upgrade/ no seu relatório de erro." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" @@ -207,6 +211,7 @@ msgid "" msgstr "" "Foi impossível instalar um pacote essencial. Por favor reporte este erro. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Impossível de descobrir meta-pacote" @@ -288,6 +293,7 @@ msgstr "" "Se escolher 'Sim' ele vai actualizar todos os '%s' para '%s' pacotes.↵\n" "Se escolher \"não\" a actualização irá ser cancelada." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Gerar as fontes padrão?" @@ -356,10 +362,11 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"A actualização abortará agora. Por favor liberte %s de espaço em disco em " -"%s. Esvazie o lixo e remova pacotes temporários de instalações anteriores " +"A actualização abortará agora. Por favor liberte %s de espaço em disco em %" +"s. Esvazie o lixo e remova pacotes temporários de instalações anteriores " "usando 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Deseja iniciar a actualização?" @@ -437,6 +444,7 @@ msgstr "" "Ocorreu algum problema durante a limpeza. Por favor verifique a mensagem " "abaixo para mais informação. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "A restaurar o estado original do sistema" @@ -447,6 +455,7 @@ msgid "Fetching backport of '%s'" msgstr "A obter backport de '%s'" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -505,6 +514,7 @@ msgstr "À procura de software obsoleto" msgid "System upgrade is complete." msgstr "A actualização do sistema está completa." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -532,6 +542,7 @@ msgstr "A obter o ficheiro %li de %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Aplicando alterações" @@ -547,9 +558,10 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" "A actualização será agora abortada. Por favor relate a ocorrência deste erro " -"no pacote 'update-manager' e inclua os ficheiros que se encontram em " -"/var/log/dist-upgrade/ no relatório de erro." +"no pacote 'update-manager' e inclua os ficheiros que se encontram em /var/" +"log/dist-upgrade/ no relatório de erro." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -577,18 +589,19 @@ msgstr "Ocorreu um erro fatal" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Por favor relate este erro e inclua os ficheiros /var/log/dist-" -"upgrade/main.log e /var/log/dist-upgrade/apt.log no seu relatório de erro. A " -"actualização abortará agora.\n" -"O ficheiro original sources.list foi guardado em " -"/etc/apt/sources.list.distUpgrade." +"Por favor relate este erro e inclua os ficheiros /var/log/dist-upgrade/main." +"log e /var/log/dist-upgrade/apt.log no seu relatório de erro. A actualização " +"abortará agora.\n" +"O ficheiro original sources.list foi guardado em /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -611,7 +624,7 @@ msgstr[0] "%d pacote será actualizado." msgstr[1] "%d pacotes serão actualizados." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -635,8 +648,9 @@ msgstr "" "Para prevenir a perda de dados feche todas as aplicações e documentos " "abertos." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado" @@ -684,6 +698,7 @@ msgid "%li seconds" msgstr "%li segundos" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -706,6 +721,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -815,6 +831,7 @@ msgstr "Impossível de descarregar as notas de lançamento" msgid "Please check your internet connection." msgstr "Por favor verifique a sua ligação à internet." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Impossível de executar a ferramenta de actualização" @@ -832,8 +849,7 @@ msgstr "A descarregar a ferramenta de actualização" #: ../UpdateManager/DistUpgradeFetcher.py:173 msgid "The upgrade tool will guide you through the upgrade process." -msgstr "" -"A ferramenta de actualização guiá-lo-á pelo processo de actualização." +msgstr "A ferramenta de actualização guiá-lo-á pelo processo de actualização." #: ../UpdateManager/DistUpgradeFetcher.py:180 msgid "Upgrade tool signature" @@ -917,14 +933,17 @@ msgstr "" "Falha a descarregar a lista de alterações. \n" "Por favor verifique a sua ligação à internet." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Actualizações de segurança importantes" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Actualizações recomendadas" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Actualizações propostas" @@ -937,71 +956,74 @@ msgstr "Backports" msgid "Distribution updates" msgstr "_Actualizações de Distribuição" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Outras actualizações" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versão %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "A descarregar a lista de alterações..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Desmarcar Todos" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Verificar Todos" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Por favor aguarde, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "A actualização está completa" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Verificar por actualizações disponíveis" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Da versão: %(old_version)s para %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Versão %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "A sua distribuição já não é suportada" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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,16 +1033,17 @@ msgstr "" "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais " "informação em como actualizar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Está disponível a nova versão '%s' da distribuição" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "O índice de software está quebrado" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1030,19 +1053,23 @@ 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 "Nenhum" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1069,8 +1096,8 @@ msgstr "Mantenha o seu sistema actualizado" #: ../data/glade/UpdateManager.glade.h:5 msgid "Not all updates can be installed" msgstr "" -"Não é possível instalar todas as actualizações \n" -" \n" +"Não é possível instalar todas as actualizações\r\n" +"\r\n" "%s" #: ../data/glade/UpdateManager.glade.h:6 @@ -1413,192 +1440,235 @@ msgstr "Tamanho da Janela" msgid "Configure the sources for installable software and updates" msgstr "Configurar os repositórios de software e actualizações instaláveis" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Mantido pela comunidade" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Drivers proprietários para dispositivos" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Software Restrito" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom com o Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "Software de Código Aberto suportado pela Canonical" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Mantido pela comunidade (universal)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Software de Código Fonte Aberto mantido pela comunidade" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Controladores não-livres" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Drivers proprietários para dispositivos " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Não-livre (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "Software restringido por copyright ou questões legais" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom com o Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 #, fuzzy msgid "Backported updates" msgstr "Actualizações dos repositórios \"backport\"" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Actualizações" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Suportado Oficialmente" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizações de Segurança do Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Actualizações do Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Backports do Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantido pela comunidade (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Sem mais suporte oficial" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Direitos de autor restritos" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizações de Segurança do Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Actualizações do Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Backports do Ubuntu 4.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Actualizações de Segurança" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatível-DFSG com Dependências Não-Livres" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software compatível-DFSG" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" @@ -1621,7 +1691,8 @@ msgstr "Software compatível-DFSG" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "A actualizar para Ubuntu 6.10" +#~ "A actualizar para Ubuntu 6.10" #~ msgid "Important security updates of Ubuntu" #~ msgstr "Actualizações de segurança importantes do Ubuntu" @@ -1648,17 +1719,16 @@ msgstr "Software compatível-DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Algumas actualizações requerem a remoção de software. Utilize a função " -#~ "\"Marcar Todas as Actualizações\" ou execute \"sudo apt-get dist-upgrade\" " -#~ "numa consola para actualizar completamente o seu sistema." +#~ "\"Marcar Todas as Actualizações\" ou execute \"sudo apt-get dist-upgrade" +#~ "\" numa consola para actualizar completamente o seu sistema." #~ msgid "The following updates will be skipped:" #~ msgstr "As seguintes actualizações serão ignoradas:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Cerca de %li segundos restantes" @@ -1679,12 +1749,14 @@ msgstr "Software compatível-DFSG" #~ msgid "Only one software management tool is allowed to run at the same time" #~ msgstr "" -#~ "Uma única ferramenta de gestão de software pode ser executada ao mesmo tempo" +#~ "Uma única ferramenta de gestão de software pode ser executada ao mesmo " +#~ "tempo" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." #~ msgstr "" -#~ "Por favor feche a outra aplicação primeiro, por ex. 'aptitude' ou 'Synaptic'." +#~ "Por favor feche a outra aplicação primeiro, por ex. 'aptitude' ou " +#~ "'Synaptic'." #~ msgid "Channels" #~ msgstr "Repositórios" @@ -1734,8 +1806,8 @@ msgstr "Software compatível-DFSG" #~ msgstr "Ubuntu 6.06 LTS Backports" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Ao pesquisar o seu repositório de informação não foi encontrada nenhuma " #~ "entrada válida de actualização.\n" @@ -1754,15 +1826,15 @@ msgstr "Software compatível-DFSG" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "A efectuar download de " -#~ "alterações\n" +#~ "A efectuar download de alterações\n" #~ "\n" #~ "É necessário obter as alterações de um servidor central" #~ msgid "" #~ "There is not enough free space on your system to download the required " -#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " -#~ "clean'" +#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-" +#~ "get clean'" #~ msgstr "" #~ "Não existe espaço suficiente no seu sistema para descarregar os pacotes " #~ "necessários. Por favor liberte algum espaço antes de tentar novamente por " @@ -1775,8 +1847,8 @@ msgstr "Software compatível-DFSG" #~ "Some problem occured during the fetching of the packages. This is most " #~ "likely a network problem. Please check your network and try again. " #~ msgstr "" -#~ "Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de um " -#~ "problema de rede. Por favor verifique a rede e tente novamente. " +#~ "Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de " +#~ "um problema de rede. Por favor verifique a rede e tente novamente. " #~ msgid "" #~ "%s packages are going to be removed.\n" @@ -1801,8 +1873,8 @@ msgstr "Software compatível-DFSG" #~ msgstr "Tem a certeza que pretende cancelar?" #~ msgid "" -#~ "Canceling during a upgrade can leave the system in a unstable state. It is " -#~ "strongly adviced to continue the operation. " +#~ "Canceling during a upgrade can leave the system in a unstable state. It " +#~ "is strongly adviced to continue the operation. " #~ msgstr "" #~ "Cancelar durante uma actualização pode deixar o seu sistema num estado " #~ "instável. É fortemente aconselhado a prosseguir a operação. " @@ -1817,4 +1889,4 @@ msgstr "Software compatível-DFSG" #~ msgstr "Nunca exibir esta mensagem novamente" #~ msgid "CD" -#~ msgstr "CD" \ No newline at end of file +#~ msgstr "CD" diff --git a/po/pt_BR.po b/po/pt_BR.po index 60893d45..def6479d 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-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-02 11:49+0000\n" "Last-Translator: Andre Noel \n" "Language-Team: Ubuntu-BR \n" @@ -54,6 +54,7 @@ msgstr "Após um mês" msgid "After %s days" msgstr "Após %s dias" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "Atualizações do %s" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Servidor principal" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "Erro removendo a chave" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "A chave selecionada não pode ser removida. Por favor reporte isto como um " "bug." @@ -167,6 +169,7 @@ msgstr "Não foi possível atualizar os meta-pacotes requeridos" 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:220 msgid "Could not calculate the upgrade" msgstr "Não foi possível processar a atualização" @@ -184,6 +187,7 @@ msgstr "" "Por favor reporte esse erro no pacote 'update-manager' e inclua os arquivos " "contidos em /var/log/dist-upgrade/ no relatório de erros." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" @@ -211,6 +215,7 @@ msgstr "" "Não foi possível instalar um pacote requerido. Por favor relate isto como um " "erro. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Não foi possível determinar o meta-pacote" @@ -291,6 +296,7 @@ msgstr "" "'Sim' atualizará todas '%s' para '%s' entradas.\n" "Se você selecionar 'não' a atualização será cancelada." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Gerar fontes padrão?" @@ -364,6 +370,7 @@ msgstr "" "de disco no %s. Esvazie sua lixeira e remova pacotes temporários de " "instalações anteriores usando 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Você quer iniciar a atualização?" @@ -435,6 +442,7 @@ msgstr "" "Alguns problemas ocorreram durante a limpeza. Por favor veja a mensagem " "abaixo para maiores informações. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Restaurando o estado original do sistema" @@ -445,6 +453,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -478,8 +487,8 @@ msgid "" "manager' package and include the files in /var/log/dist-upgrade/ in the " "bugreport." msgstr "" -"Depois que a sua informação do pacote foi atualizada, o pacote essencial " -"'%s' não pôde mais ser encontrado.\n" +"Depois que a sua informação do pacote foi atualizada, o pacote essencial '%" +"s' não pôde mais ser encontrado.\n" "Isso indica uma falha grave, por favor reporte isso como um erro no pacote " "do 'update-manager' e inclua os arquivos contidos em /var/log/dist-upgrade/ " "no relatório de erros." @@ -500,6 +509,7 @@ msgstr "Buscando programas obsoletos" msgid "System upgrade is complete." msgstr "A atualização do sistema está completa." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -528,6 +538,7 @@ msgstr "Obtendo arquivo %li de %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Aplicando mudanças" @@ -546,6 +557,7 @@ msgstr "" "'update-manager' e inclua os arquivos em /var/log/dist-upgrade/ no relatório " "de erros." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -571,17 +583,18 @@ msgstr "Ocorreu um erro fatal" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Por favor relate isto como um bug e inclua os arquivos /var/log/dist-" -"upgrade.log e /var/log/dist-upgrade-apt.log em seu relatório. A atualização " -"será abortada agora.\n" +"Por favor relate isto como um bug e inclua os arquivos /var/log/dist-upgrade." +"log e /var/log/dist-upgrade-apt.log em seu relatório. A atualização será " +"abortada agora.\n" "Seu sources.list original foi salvo em /etc/apt/sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -626,8 +639,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "Para evitar perda de dados, feche todas as aplicações e documentos." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Seu sistema está atualizado" @@ -675,6 +689,7 @@ msgid "%li seconds" msgstr "%li segundos" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -696,6 +711,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -715,8 +731,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" -msgstr "" -"Reinicie o seu sistema para finalizar a atualização" +msgstr "Reinicie o seu sistema para finalizar a atualização" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -806,6 +821,7 @@ msgstr "Não foi possível obter as notas de lançamento" msgid "Please check your internet connection." msgstr "Por favor, verifique sua conexão de internet." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Não foi possível executar a ferramenta de atualização" @@ -904,14 +920,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Principais Atualizações de Segurança" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Atualizações recomendadas" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Atualizações sugeridas" @@ -924,71 +943,74 @@ msgstr "Backports" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Outras atualizações" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versão %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Desmarcar Todos" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Marcar Todos" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Aguarde por favor, isso pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "A atualização está completa" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Verificando por atualizações" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Versão %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Sua distribuição não é mais suportada" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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,16 +1020,17 @@ msgstr "" "falhas de segurança. Atualize para uma versão mais nova do Ubuntu Linux. " "Veja http://www.ubuntu-br.org para mais informações." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Uma nova versão da distribuição '%s' está disponível" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "O index do software está quebrado" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1017,19 +1040,23 @@ 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 "Nenhum" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1261,8 +1288,8 @@ msgid "" "\n" "You need a working internet connection to continue." msgstr "" -"A informação sobre programas disponíveis está " -"desatualizada\n" +"A informação sobre programas disponíveis está desatualizada\n" "\n" "Para instalar programas e atualizações de fontes recentemente adicionadas ou " "alteradas, você tem que recarregar as informações sobre programas " @@ -1372,8 +1399,7 @@ msgstr "Exibir detalhes de uma atualização" #: ../data/update-manager.schemas.in.h:6 msgid "Stores the size of the update-manager dialog" -msgstr "" -"Armazena o tamanho da caixa de diálogo do gerenciador de atualizações" +msgstr "Armazena o tamanho da caixa de diálogo do gerenciador de atualizações" #: ../data/update-manager.schemas.in.h:7 msgid "" @@ -1390,190 +1416,233 @@ msgstr "O tamanho da janela" msgid "Configure the sources for installable software and updates" msgstr "Configurar os canais de software e atualizações via internet" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Mantido pela comunidade" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Controladores proprietários para dispositivos" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Software restrito" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom com Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Mantido pela Comunidade (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Programa de Código Aberto mantido pela Comunidade" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Drivers Não-livres" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Controladores proprietários para dispositivos " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Programas restritos (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom com o Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Atualizações \"Backport\"" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Atualizações do Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Backports do Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Suportado oficialmente" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Atualizações do Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Backports do Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantido pela Comunidade (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Não-livres (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Não é mais suportado oficialmente" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restrito" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Atualizações do Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Backports do Ubuntu 4.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Atualizações de Segurança do Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testando)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (instável)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Programa compatível com a DFSG mas com Dependências Não-Livres" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Programas não compatíveis com a DFSG" -#, python-format #~ msgid "" #~ "Error scaning the CD\n" #~ "\n" @@ -1587,22 +1656,22 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "A unresolvable problem occured while calculating the upgrade.\n" #~ "\n" -#~ "Please report this bug against the 'update-manager' package and include the " -#~ "files in /var/log/dist-upgrade/ in the bugreport." +#~ "Please report this bug against the 'update-manager' package and include " +#~ "the files in /var/log/dist-upgrade/ in the bugreport." #~ msgstr "" -#~ "Um problema sem solução ocorreu durante o cálculo da atualização. Por favor " -#~ "relate isto como um erro." +#~ "Um problema sem solução ocorreu durante o cálculo da atualização. Por " +#~ "favor relate isto como um erro." #~ 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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." #~ msgstr "" #~ "O seu sistema não possui um pacote ubuntu-desktop, kubuntu-desktop ou " -#~ "edubuntu-desktop e não foi possível detectar qual versão do Ubuntu você está " -#~ "executando.\n" +#~ "edubuntu-desktop e não foi possível detectar qual versão do Ubuntu você " +#~ "está executando.\n" #~ "Por favor instale um desses pacotes primeiro usando o Synaptic ou apt-get " #~ "antes de continuar." @@ -1611,9 +1680,9 @@ msgstr "Programas não compatíveis com a DFSG" #~ "enable them after the upgrade with the 'software-properties' tool or with " #~ "synaptic." #~ msgstr "" -#~ "Algumas entradas de terceiros de seu sources.list foram desabilitadas. Você " -#~ "poderá reabilitá-las depois de atualizar com a ferramenta 'propriedades do " -#~ "programa' ou com o synaptic." +#~ "Algumas entradas de terceiros de seu sources.list foram desabilitadas. " +#~ "Você poderá reabilitá-las depois de atualizar com a ferramenta " +#~ "'propriedades do programa' ou com o synaptic." #~ msgid "Some software no longer officially supported" #~ msgstr "Alguns softwares não são mais oficialmente suportado." @@ -1631,7 +1700,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ "Se você não tem o repositório 'universe' habilitado, estes pacotes serão " #~ "sugeridos à remoção no próximo passo. " -#, python-format #~ msgid "" #~ "Replace configuration file\n" #~ "'%s'?" @@ -1639,19 +1707,16 @@ msgstr "Programas não compatíveis com a DFSG" #~ "Substituir arquivo de configuração\n" #~ "'%s' ?" -#, python-format #~ msgid "%s package is going to be removed." #~ msgid_plural "%s packages are going to be removed." #~ msgstr[0] "%s pacote será removido." #~ msgstr[1] "%s pacotes serão removidos." -#, python-format #~ msgid "%s new package is going to be installed." #~ msgid_plural "%s new packages are going to be installed." #~ msgstr[0] "%s novo pacote será instalado." #~ msgstr[1] "%s novos pacotes serão instalados." -#, python-format #~ msgid "%s package is going to be upgraded." #~ msgid_plural "%s packages are going to be upgraded." #~ msgstr[0] "%s pacote será atualizado." @@ -1663,10 +1728,9 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "Your system has already been upgraded." #~ msgstr "Seu sistema já foi atualizado." -#, python-format #~ msgid "" -#~ "This download will take about %s with a 56k modem and about %s with a 1Mbit " -#~ "DSL connection" +#~ "This download will take about %s with a 56k modem and about %s with a " +#~ "1Mbit DSL connection" #~ msgstr "" #~ "Este download demorará cerca de %s com um modem 56k e cerca de %s com uma " #~ "conexão 1Mbit DSL." @@ -1674,27 +1738,26 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Atualizando para o Ubuntu 6.10" +#~ "Atualizando para o Ubuntu 6.10" #~ msgid "" -#~ "Verfing the upgrade failed. There may be a problem with the network or with " -#~ "the server. " +#~ "Verfing the upgrade failed. There may be a problem with the network or " +#~ "with the server. " #~ msgstr "" #~ "Falha na verificação da atualização. Pode haver um problema com a rede ou " #~ "com o servidor. " -#, python-format #~ msgid "Downloading file %li of %li with %s/s" #~ msgstr "Obtendo arquivo %li de %li a %s/s" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" #~ msgid "The list of changes is not available yet. Please try again later." #~ msgstr "" -#~ "A lista de alterações não está disponível ainda. Por favor, tente novamente " -#~ "mais tarde." +#~ "A lista de alterações não está disponível ainda. Por favor, tente " +#~ "novamente mais tarde." #~ msgid "" #~ "Failed to download the list of changes. Please check your Internet " @@ -1730,21 +1793,21 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "Select _All" #~ msgstr "Selecion_ar Todos" -#, python-format #~ msgid "From version %s to %s" #~ msgstr "Da versão %s para %s" #~ msgid "" #~ "You must check for updates manually\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" #~ "Você deve verificar por atualizações manualmente\n" #~ "\n" #~ "O seu sistema não procura por atualizações automaticamente. Você pode " -#~ "configurar essa opção em \"Sistema\" -> \"Administração\" -> \"Propriedades " -#~ "de Programas\"." +#~ "configurar essa opção em \"Sistema\" -> \"Administração\" -> " +#~ "\"Propriedades de Programas\"." #~ msgid "" #~ "Examining your system\n" @@ -1754,8 +1817,8 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "" #~ "Verificando as Atualizações Disponíveis\n" #~ "\n" -#~ "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " -#~ "segurança, e prover novas funcionalidades para você." +#~ "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades " +#~ "de segurança, e prover novas funcionalidades para você." #~ msgid "Cancel _Download" #~ msgstr "Cancelar _Download" @@ -1763,8 +1826,8 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "The channel information is out-of-date\n" #~ "\n" -#~ "You have to reload the channel information to install software and updates " -#~ "from newly added or changed channels. \n" +#~ "You have to reload the channel information to install software and " +#~ "updates from newly added or changed channels. \n" #~ "\n" #~ "You need a working internet connection to continue." #~ msgstr "" @@ -1776,8 +1839,8 @@ msgstr "Programas não compatíveis com a DFSG" #~ "Você necessita uma conexão de internet para continuar." #~ msgid "" -#~ "Enter the complete APT line of the source that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the source that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a source, for " #~ "example \"deb http://ftp.debian.org sarge main\"." @@ -1790,8 +1853,8 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "If automatic checking for updates is disabeld, you have to reload the " -#~ "channel list manually. This option allows to hide the reminder shown in this " -#~ "case." +#~ "channel list manually. This option allows to hide the reminder shown in " +#~ "this case." #~ msgstr "" #~ "Se a verificação automática de atualizações for desativada, você terá que " #~ "recarregar manualmente a lista de canais. Esta opção perminte que você " @@ -1818,18 +1881,17 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Algumas atualizações requerem a remoção de outros pacotes.Use a função " -#~ "\"Marcar Todas Atualizações\" do gerenciador de pacotes \"Synaptic\" ou rode " -#~ "\"sudo apt-get dist-upgrade\" em um terminal para atualizar seu sistema " -#~ "completamente." +#~ "\"Marcar Todas Atualizações\" do gerenciador de pacotes \"Synaptic\" ou " +#~ "rode \"sudo apt-get dist-upgrade\" em um terminal para atualizar seu " +#~ "sistema completamente." #~ msgid "The following updates will be skipped:" #~ msgstr "As seguintes atualizações serão puladas:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Aproximadamente %li segundos restando" @@ -1850,7 +1912,8 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "Only one software management tool is allowed to run at the same time" #~ msgstr "" -#~ "Apenas uma ferramenta de gerenciamento de pacotes pode rodar ao mesmo tempo" +#~ "Apenas uma ferramenta de gerenciamento de pacotes pode rodar ao mesmo " +#~ "tempo" #~ msgid "" #~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." @@ -1909,8 +1972,8 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "Backports do Ubuntu 6.06 LTS" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Enquanto analisava as informações de repositórios não foi encontrada uma " #~ "entrada válida para a atualização.\n" @@ -1961,12 +2024,12 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "There is not enough free space on your system to download the required " -#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " -#~ "clean'" +#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-" +#~ "get clean'" #~ msgstr "" #~ "Não há espaço suficiente no seu sistema para obter os pacotes requeridos. " -#~ "Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-get " -#~ "clean'" +#~ "Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-" +#~ "get clean'" #~ msgid "Error fetching the packages" #~ msgstr "Erro ao obter os pacotes" @@ -1976,8 +2039,8 @@ msgstr "Programas não compatíveis com a DFSG" #~ "likely a network problem. Please check your network and try again. " #~ msgstr "" #~ "Alguns problemas ocorreram durante a obtenção dos pacotes. Isso é bem " -#~ "provável que seja por problemas de rede. Por favor verifique a sua conexão " -#~ "de rede e tente novamente. " +#~ "provável que seja por problemas de rede. Por favor verifique a sua " +#~ "conexão de rede e tente novamente. " #~ msgid "" #~ "%s packages are going to be removed.\n" @@ -2002,11 +2065,11 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "Tem certeza que deseja cancelar?" #~ msgid "" -#~ "Canceling during a upgrade can leave the system in a unstable state. It is " -#~ "strongly adviced to continue the operation. " +#~ "Canceling during a upgrade can leave the system in a unstable state. It " +#~ "is strongly adviced to continue the operation. " #~ msgstr "" -#~ "Cancelar durante a atualização pode deixar o sistema em um estado instável. " -#~ "É fortemente recomendável que a operação continue. " +#~ "Cancelar durante a atualização pode deixar o sistema em um estado " +#~ "instável. É fortemente recomendável que a operação continue. " #, fuzzy #~ msgid "Sources" @@ -2029,13 +2092,13 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgid "Repository" #~ msgstr "Repository" @@ -2055,16 +2118,16 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "" #~ "Authentication keys\n" #~ "\n" -#~ "You can add and remove authentication keys in this dialogue. A key makes it " -#~ "possible to check verify the integrity of the software you download." +#~ "You can add and remove authentication keys in this dialogue. A key makes " +#~ "it possible to check verify the integrity of the software you download." #~ msgid "A_uthentication" #~ msgstr "A_uthentication" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " @@ -2089,11 +2152,11 @@ msgstr "Programas não compatíveis com a DFSG" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Restore the default keys shiped with the distribution. This will not change " -#~ "user-installed keys." +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user-installed keys." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Set _maximum size for the package cache" @@ -2126,11 +2189,13 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "Changes not found, the server may not be updated yet." @@ -2139,11 +2204,11 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "The updates are being applied." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Updating package list..." #~ msgstr "Updating package list..." @@ -2153,33 +2218,33 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "There is a new release of Ubuntu available!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgid "Never show this message again" #~ msgstr "Never show this message again" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Initializing and getting list of updates..." @@ -2211,10 +2276,10 @@ msgstr "Programas não compatíveis com a DFSG" #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." \ No newline at end of file +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." diff --git a/po/qu.po b/po/qu.po index 38609208..d8a39c96 100644 --- a/po/qu.po +++ b/po/qu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Quechua \n" @@ -55,6 +55,7 @@ msgstr "" msgid "After %s days" msgstr "" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -158,6 +160,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -170,6 +173,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -192,6 +196,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -251,6 +256,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -307,6 +313,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -369,6 +376,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -379,6 +387,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -429,6 +438,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -456,6 +466,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -471,6 +482,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -494,13 +506,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -540,8 +553,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -587,6 +601,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -606,6 +621,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -711,6 +727,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -800,14 +817,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -820,106 +840,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1241,184 +1269,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/ro.po b/po/ro.po index 9335d302..e11b90cb 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:40+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: " -"nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?1:2)\n" +"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?" +"1:2)\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" @@ -56,6 +56,7 @@ msgstr "După o lună" msgid "After %s days" msgstr "După %s zile" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "%s actualizări" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "Server principal" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,12 +125,11 @@ msgid "Error removing the key" msgstr "Eroare la ştergerea cheii." #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -167,6 +169,7 @@ msgstr "Este imposibilă actualizarea meta-pachetelor cerute" msgid "A essential package would have to be removed" msgstr "Un pachet esenţial ar trebui şters" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Imposibil de calculat actualizarea" @@ -179,6 +182,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 #, fuzzy msgid "Error authenticating some packages" @@ -207,6 +211,7 @@ msgstr "" "Nu am reuşit să instalez pachetul cerut. Vă rugăm raportaţi acest lucru ca " "bug (eroare). " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Imposibl de ghicit meta-pachet" @@ -285,6 +290,7 @@ msgstr "" "Doriţi să rescrieţi fişierul 'sources.list' oricum? Dacă selectaţi 'Da' se " "vor modifica toate intrările din '%s' în '%s'." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Generez surse implicite?" @@ -353,6 +359,7 @@ msgstr "" "pe disc pe %s. Goliţi coşul de gunoi şi ştergeţi pachetele temporare de la " "instalările vechi folosind 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Vrei sa începi upgrade-ul?" @@ -424,6 +431,7 @@ msgstr "" "O problemă a apărut în timpul acţiunii de curăţenie. Vă rugăm vedeţi mesajul " "de mai jos pentru informaţii suplimentare. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 #, fuzzy msgid "Restoring original system state" @@ -435,6 +443,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -469,8 +478,8 @@ msgid "" "manager' package and include the files in /var/log/dist-upgrade/ in the " "bugreport." msgstr "" -"După ce informaţiile despre pachete au fost actualizate pachetul esenţial " -"'%s' nu mai poate fi găsit.\n" +"După ce informaţiile despre pachete au fost actualizate pachetul esenţial '%" +"s' nu mai poate fi găsit.\n" "Aceasta indică o eroare serioasă, vă rugăm raportaţi o eroare la pachetul " "'update-manager' şi includeţi fişierele din /var/log/dist-upgrade/ în raport." @@ -490,6 +499,7 @@ msgstr "Caut software învechit" msgid "System upgrade is complete." msgstr "Actualizarea sistemului este completă" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -517,6 +527,7 @@ msgstr "Se descarcă fişierul %li din %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Se aplică modificările" @@ -534,6 +545,7 @@ msgstr "" "Actualizarea se opreşte acum. Vă rugăm raportaţi o eroare la pachetul " "'update-manager' şi includeţi fişierele din /var/log/dist-upgrade/ în raport." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -557,18 +569,19 @@ msgstr "S-a produs o eroare fatală" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Vă rugăm raportaţi aceasta ca eroare şi includeţi fişierele /var/log/dist-" "upgrade/main.log şi /var/log/dist-upgrade/apt.log în raportul dumneavoastră. " "Actualizarea se orpeşte acum.\n" -"Fişierul iniţial sources.list a fost salvat în " -"/etc/apt/sources.list.distUpgrade." +"Fişierul iniţial sources.list a fost salvat în /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -618,8 +631,9 @@ msgstr "" "Pentru a preveni pierderea datelor închideţi toate aplicaţiile şi " "documentele." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Sistemul dumneavoastră este actualizat la zi!" @@ -665,6 +679,7 @@ msgid "%li seconds" msgstr "%li secunde" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -686,6 +701,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -797,6 +813,7 @@ msgstr "Nu pot descărca notiţele de lansare" msgid "Please check your internet connection." msgstr "Verificaţi conexiunea internet" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Nu pot rula utilitarul de actualizare" @@ -896,14 +913,17 @@ msgstr "" "Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o " "conexiune internet activă." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Actualizări importante de securitate" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Actualizări recomandate" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Pachete propuse" @@ -918,34 +938,36 @@ msgstr "Actualizări de securitate Ubuntu 5.04" msgid "Distribution updates" msgstr "_Continuă Actualizarea" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Alte actualizări" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Versiunea %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Se descarcă listă schimbărilor..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Dimensiune descărcare: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -953,39 +975,40 @@ msgstr[0] "Puteţi instala actualizarea %s" msgstr[1] "Puteţi instala actualizarea %s" msgstr[2] "Puteţi instala actualizarea %s" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Vă rugăm aşteptaţi, ar putea dura." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Actualizare completă." -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "_Instalează actualizarile" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Versiunea nouă: %s (Mărime: %s)" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Versiunea %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Dimensiune: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Distribuţia dvs. nu mai este asistată" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -995,16 +1018,17 @@ msgstr "" "Instalaţi o versiune mai nouă a Ubuntu Linux. Vedeţi http://www.ubuntu.com " "pentru mai multe informaţii legate de actualizare." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Noua versiune '%s' este disponibilă" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Indexul software este deteriorat" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1014,19 +1038,23 @@ msgstr "" "managerul de pachete \"Synaptic\" sau rulaţi \"sudo apt-get install -f\" " "într-un terminal pentru a remedia această problemă." +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 msgid "None" msgstr "Nimic" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1294,9 +1322,9 @@ msgstr "" "Introduceţi linia APT completă a locaţiei pe care doriţi să o " "adăugaţi\n" "\n" -"Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de " -"exemplu\"deb http://ftp.debian.org sarge main\". Puteţi găsi o " -"descriere detaliată a sintaxei în documentaţie." +"Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de exemplu" +"\"deb http://ftp.debian.org sarge main\". Puteţi găsi o descriere " +"detaliată a sintaxei în documentaţie." #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1379,191 +1407,235 @@ msgstr "Dimensiunea ferestrei" msgid "Configure the sources for installable software and updates" msgstr "Configurează sursele pentru software instalabil şi actualizări" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Pachete întreţinute de comunitate (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Software în contribuţie" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cdrom cu Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Pachete întreţinute de comunitate (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Pachete întreţinute de comunitate (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Pachete întreţinute de comunitate (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Pachete non-libere" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Software restricţionat (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cdrom cu Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Actualizări portate înapoi" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualizări Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Pachete suportate oficial" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Actualizări Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Pachete întreţinute de comunitate (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Pachete non-libere (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Pachete suportate oficial" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restrictiv" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizări de securitate Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Actualizări Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizări de securitate Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatibil DFSG cu dependenţe negratuite" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software incompatibil DFSG" @@ -1681,13 +1753,13 @@ msgstr "Software incompatibil DFSG" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Actualizări disponibile\n" #~ "\n" -#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările apăsând " -#~ "pe butonul Instalează." +#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările " +#~ "apăsând pe butonul Instalează." #~ msgid "Repository" #~ msgstr "Locaţie" @@ -1707,8 +1779,8 @@ msgstr "Software incompatibil DFSG" #~ msgstr "" #~ "Chei autentificare\n" #~ "\n" -#~ "Din acest dialog puteţi adăuga sau şterge chei de autentificare. Rolul unei " -#~ "chei estede a permite verificarea integrităţii unui pachet software " +#~ "Din acest dialog puteţi adăuga sau şterge chei de autentificare. Rolul " +#~ "unei chei estede a permite verificarea integrităţii unui pachet software " #~ "descărcat." #~ msgid "A_uthentication" @@ -1716,8 +1788,8 @@ msgstr "Software incompatibil DFSG" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Adăugaţi o nouă cheie în keyring-ul de încredere. Asiguraţi-vă că aţi " #~ "obţinut cheia printr-un canal sigur şi că aveţi încredere în proprietarul " @@ -1734,8 +1806,8 @@ msgstr "Software incompatibil DFSG" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Restaurează cheile implicite furnizate împreună cu distribuţia. Această " #~ "acţiune nu va influenţa cheile instalate ca utilizator." @@ -1760,8 +1832,8 @@ msgstr "Software incompatibil DFSG" #~ msgstr "Actualizările sunt în curs de aplicare." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Puteţi rula doar un singur manager de pachete la un moment dat. Vă rog să " #~ "închideţi ceilalţi manageri mai întâi." @@ -1771,8 +1843,8 @@ msgstr "Software incompatibil DFSG" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" #~ "Puteţi rula doar un singur manager de pachete la un moment dat. Vă rog să " #~ "închideţi ceilalţi manageri mai întâi." @@ -1795,13 +1867,13 @@ msgstr "Software incompatibil DFSG" #, fuzzy #~ msgid "" #~ "Available Updates\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Actualizări disponibile\n" #~ "\n" -#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările apăsând " -#~ "pe butonul Instalează." +#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările " +#~ "apăsând pe butonul Instalează." #~ msgid "0" -#~ msgstr "0" \ No newline at end of file +#~ msgstr "0" diff --git a/po/ru.po b/po/ru.po index ff5f15bb..8274052c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-03 02:07+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -18,7 +18,6 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" - #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" msgstr "Ежедневно" @@ -57,6 +56,7 @@ msgstr "Через месяц" msgid "After %s days" msgstr "Через %s дней" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -64,6 +64,7 @@ msgstr "%s обновлений" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -73,6 +74,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Основной сервер" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,8 +124,7 @@ msgid "Error removing the key" msgstr "Ошибка при удалении ключа" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке." @@ -167,6 +168,7 @@ msgstr "Невозможно обновить требуемые мета-пак msgid "A essential package would have to be removed" msgstr "Будет удален необходимый пакет" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Невозможно подготовить обновление системы" @@ -183,6 +185,7 @@ msgstr "" "Пожалуйста, отправьте отчет об ошибке программы 'update-manager' и добавьте " "файлы в /var/log/dist-upgrade/ к отчету." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Ошибка при проверке подлинности некоторых пакетов" @@ -210,6 +213,7 @@ msgstr "" "Невозможно установить необходимый пакет. Пожалуйста, отправьте отчет об " "ошибке. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Невозможно подобрать мета-пакет" @@ -289,6 +293,7 @@ msgstr "" "обновлены все записи '%s' на '%s'.\n" "Ответ 'Нет' отменит обновление." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Сгенерировать источники по умолчанию?" @@ -301,8 +306,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"В результате просмотра 'sources.list' не найдена действующая запись для " -"'%s'.\n" +"В результате просмотра 'sources.list' не найдена действующая запись для '%" +"s'.\n" "\n" "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление." @@ -359,6 +364,7 @@ msgstr "" "%s. Очистите вашу корзину и удалите временные пакеты, оставшиеся от " "предыдущих установок с помощью команды 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Вы хотите начать обновление системы?" @@ -435,6 +441,7 @@ msgstr "" "При очистке возникла проблема. Более полная информация приведена в сообщении " "ниже. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Восстановление первоначального состояния системы" @@ -445,6 +452,7 @@ msgid "Fetching backport of '%s'" msgstr "Загрузка '%s' из репозитария backports" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -498,6 +506,7 @@ msgstr "Поиск устаревших программ" msgid "System upgrade is complete." msgstr "Обновление системы завершено." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -525,6 +534,7 @@ msgstr "Загрузка файла %li из %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Применение изменений" @@ -542,6 +552,7 @@ msgstr "" "Обновление прервано. Пожалуйста сообщите об ошибке в пакете 'update-manager' " "и включите файлы, находящиеся в /var/log/dist-upgrade/ в сообщение об ошибке" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -567,17 +578,18 @@ msgstr "Произошла неисправимая ошибка" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Пожалуйста, отправьте отчет об ошибке и включите в него файлы /var/log/dist-" "upgrade.log и /var/log/dist-upgrade-apt.log. Обновление прервано.\n" -"Оригинальный файл sources.list был сохранен как " -"/etc/apt/sources.list.distUpgrade." +"Оригинальный файл sources.list был сохранен как /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -626,8 +638,9 @@ msgid "To prevent data loss close all open applications and documents." msgstr "" "Чтобы избежать потерь данных, закройте все открытые приложения и документы." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Ваша система не требует обновления" @@ -674,6 +687,7 @@ msgid "%li seconds" msgstr "%li секунд" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -688,12 +702,12 @@ msgstr "Требуется перезагрузка" #: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" -msgstr "" -"Обновление завершено и требуется перезагрузка. Перезагрузиться сейчас?" +msgstr "Обновление завершено и требуется перезагрузка. Перезагрузиться сейчас?" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -803,6 +817,7 @@ msgstr "Не могу загрузить сведения о релизе" msgid "Please check your internet connection." msgstr "Пожалуйста, проверьте соединение с интернет." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Невозможно запустить утилиту обновления" @@ -900,14 +915,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Важные обновления безопасности" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Рекомендованые обновления" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Предлагаемые обновления" @@ -920,33 +938,35 @@ msgstr "Бэкпорты" msgid "Distribution updates" msgstr "Обновления дистрибутива" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Прочие обновления" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "Загрузка списка изменений..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "Сбросить все" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "Проверить все" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Размер загружаемых данных: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -954,38 +974,39 @@ msgstr[0] "Вы можете установить %s обновление" msgstr[1] "Вы можете установить %s обновления" msgstr[2] "Вы можете установить %s обновлений" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Пожалуйста подождите, это может занять некоторое время." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Обновление завершено" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Проверка наличия обновлений" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "С версии %(old_version)s на %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Версия %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Размер: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Ваша версия Ubuntu больше не поддерживается" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -995,16 +1016,17 @@ msgstr "" "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для " "получения информации об обновлении посетите http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Доступен новый релиз дистрибутива '%s'" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Индекс программ поврежден" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1014,19 +1036,23 @@ 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 "1 Кб" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f Кб" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1387,207 +1413,251 @@ msgstr "Размер окна" msgid "Configure the sources for installable software and updates" msgstr "Настроить источники установки программ и обновлений" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Поддерживается сообществом" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Проприетарные драйвера устройств" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Несвободное ПО" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CDROM с Ubuntu 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Поддерживается сообществом (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Поддерживаемое сообществом свободное ПО" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Несвободные драйвера" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Проприетарные драйвера устройств " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Несвободное обеспечение (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "CD с Ubuntu 6.06 LTS 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Обновления в бэкпортах" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD с Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Обновления безопасности Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Обновления Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 бэкпорты" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официально поддерживается" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Обновления безопасности Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Обновления Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 бэкпорты" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Поддерживается сообществом (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Несвободное (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Официально больше не поддерживается" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Ограниченные авторские права" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Обновления безопасности Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Обновления Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 бэкпорты" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Обновления безопасности Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-совместимое ПО с зависимостями от несвободного ПО" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-совместимое ПО" #~ msgid "" -#~ "You will loose all customizations, that have been made by yourself or by a " -#~ "script, if you replace the file by its latest version." +#~ "You will loose all customizations, that have been made by yourself or by " +#~ "a script, if you replace the file by its latest version." #~ msgstr "" #~ "Если вы замените файл его поздней версией, вы потеряете все изменения " #~ "сделанные вами или скриптами." -#, python-format #~ msgid "" -#~ "This download will take about %s with a 56k modem and about %s with a 1Mbit " -#~ "DSL connection" +#~ "This download will take about %s with a 56k modem and about %s with a " +#~ "1Mbit DSL connection" #~ msgstr "" #~ "Скачивание займёт примерно %s при 56к модеме и примерно %s при 1Мбит DSL-" #~ "подключении" #~ msgid "The list of changes is not available yet. Please try again later." #~ msgstr "" -#~ "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." +#~ "На данный момент список изменений недоступен. Пожалуйста, попробуйте " +#~ "позднее." #~ msgid "" #~ "Failed to download the list of changes. Please check your Internet " @@ -1604,7 +1674,6 @@ msgstr "Не-DFSG-совместимое ПО" #~ "Программное обеспечение, ограниченное копирайтом или другими правовыми " #~ "проблемами" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Загрузка файла %li из %li с неизвестной скоростью" @@ -1655,17 +1724,17 @@ msgstr "Не-DFSG-совместимое ПО" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Некоторые обновления требуют удаления других приложений. Для полного " -#~ "обновления системы используйте функцию \"Пометить все обновления\" менеджера " -#~ "пакетов \"Synaptic\" или запустите в терминале \"sudo apt-get dist-upgrade\"." +#~ "обновления системы используйте функцию \"Пометить все обновления\" " +#~ "менеджера пакетов \"Synaptic\" или запустите в терминале \"sudo apt-get " +#~ "dist-upgrade\"." #~ msgid "The following updates will be skipped:" #~ msgstr "Следующие обновления будут пропущены:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Осталось приблизительно %li секунд" @@ -1741,4 +1810,4 @@ msgstr "Не-DFSG-совместимое ПО" #~ msgstr "Обновления Ubuntu 6.06 LTS" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Ubuntu 6.06 LTS Backports" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS Backports" diff --git a/po/rw.po b/po/rw.po index d3e86628..4d7d8978 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:43+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -63,13 +63,15 @@ msgstr "" msgid "After %s days" msgstr "" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "Kwinjiza porogaramu" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -79,6 +81,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -133,8 +136,7 @@ msgstr "i Urufunguzo" #: ../SoftwareProperties/SoftwareProperties.py:993 #, fuzzy -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 @@ -171,6 +173,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -184,6 +187,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -207,6 +211,7 @@ msgid "" "bug. " msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -266,6 +271,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -323,6 +329,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -385,6 +392,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -395,6 +403,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 #, fuzzy @@ -448,6 +457,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -475,6 +485,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 #, fuzzy msgid "Applying changes" @@ -491,6 +502,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -514,13 +526,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -557,8 +570,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 #, fuzzy msgid "Your system is up-to-date" msgstr "Sisitemu ni Hejuru Kuri Itariki" @@ -605,6 +619,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -624,6 +639,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -734,6 +750,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -829,15 +846,18 @@ msgid "" msgstr "" "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "5" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -853,109 +873,117 @@ msgstr "5" msgid "Distribution updates" msgstr "Byarangiye" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Kwinjiza porogaramu" -#: ../UpdateManager/UpdateManager.py:462 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:478 +#, fuzzy, python-format msgid "Version %s: \n" msgstr "Verisiyo \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Iyimura... i" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:633 +#, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Kwinjiza porogaramu" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Verisiyo" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ikwirakwiza... ni Oya" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1300,207 +1328,252 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "5" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Kohereza Nta gukoresha bisesuye" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Kigenga" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Kigenga" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "5" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 #, fuzzy msgid "Non-free (Multiverse)" msgstr "Kigenga" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 #, fuzzy msgid "Restricted copyright" msgstr "Uburenganzira bw'umuhimbyi" +#. Description #: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "5" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "5" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "4. 10" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1631,8 +1704,8 @@ msgstr "" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "> Ukoresha: Utubuto" @@ -1719,7 +1792,8 @@ msgstr "" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "i Bya i Igikorwa Nka gukora iyinjizaporogaramu:%s Cyangwa ni Bya ngombwa " #~ "Gukoresha Cyangwa Kubona Kuri i" @@ -1734,8 +1808,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Gukoresha Porogaramu ku i Igihe Gufunga iyi Ikindi Porogaramu Itangira" @@ -1750,16 +1824,16 @@ msgstr "" #, fuzzy #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Kuri a Verisiyo Bya Verisiyo Oya Kubona Umutekano Cyangwa Ikindi Ibyangombwa " -#~ "HTTP www org kugirango Ibisobanuro" +#~ "Kuri a Verisiyo Bya Verisiyo Oya Kubona Umutekano Cyangwa Ikindi " +#~ "Ibyangombwa HTTP www org kugirango Ibisobanuro" #, fuzzy #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "A Gishya Na: i ni Bihari HTTP www org kugirango Amabwiriza" #, fuzzy @@ -1768,8 +1842,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" #~ "Gukoresha Porogaramu ku i Igihe Gufunga iyi Ikindi Porogaramu Itangira" @@ -1798,4 +1872,4 @@ msgstr "" #, fuzzy #~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "com" \ No newline at end of file +#~ msgstr "com" diff --git a/po/sk.po b/po/sk.po index f8f2a15c..34c34f09 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:43+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" @@ -55,15 +55,17 @@ msgstr "Po mesiaci" msgid "After %s days" msgstr "Po %s dňoch" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 -#, fuzzy +#, fuzzy, python-format msgid "%s updates" msgstr "Nainštalovať _aktualizácie" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 -#, fuzzy +#, fuzzy, python-format msgid "%s (%s)" msgstr "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -123,12 +126,11 @@ msgid "Error removing the key" msgstr "Chyba pri odstraňovaní kľúča" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -166,6 +168,7 @@ msgstr "Nemôžem aktualizovať požadované meta-balíky" 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:220 msgid "Could not calculate the upgrade" msgstr "Nemôžem vypočítať aktualizáciu" @@ -181,6 +184,7 @@ msgstr "" "Počas prípravy aktualizácie sa vyskytol neriešiteľný problém. Nahláste to " "ako chybu." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíkov" @@ -206,6 +210,7 @@ msgid "" "bug. " msgstr "Požadovaný balík nebolo možné nainštalovať. Nahláste to ako chybu. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Nemôžem odhadnúť meta balík." @@ -278,6 +283,7 @@ msgstr "" "nahradené všetky '%s' záznamy '%s' záznamami.\n" "Pokiaľ zvolíte 'Nie', súbor nebude zmenený." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?" @@ -290,8 +296,8 @@ msgid "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." msgstr "" -"Počas čítania súboru 'sources.list' nebol nájdený žiadny platný záznam pre " -"'%s'.\n" +"Počas čítania súboru 'sources.list' nebol nájdený žiadny platný záznam pre '%" +"s'.\n" "\n" "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor " "nebude zmenený." @@ -350,6 +356,7 @@ msgstr "" "vyprázdnením svojho kôša, prípadne odstránením dočasných inštalačných " "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:440 msgid "Do you want to start the upgrade?" msgstr "Chcete začať s aktualizáciou?" @@ -425,6 +432,7 @@ msgstr "" "Počas čistenia sa vyskytli problémy. Pre viac informácií si pozrite nižšie " "uvedené správy. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Obnovuje sa pôvodný stav systému" @@ -435,6 +443,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -464,7 +473,7 @@ msgid "Invalid package information" msgstr "Neplatná informácia o balíku" #: ../DistUpgrade/DistUpgradeControler.py:721 -#, fuzzy +#, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore.\n" @@ -472,8 +481,8 @@ msgid "" "manager' package and include the files in /var/log/dist-upgrade/ in the " "bugreport." msgstr "" -"Po aktualizácií informácií o balíkoch nie je možné nájsť dôležitý balík " -"'%s'.\n" +"Po aktualizácií informácií o balíkoch nie je možné nájsť dôležitý balík '%" +"s'.\n" "To znamená závažný problém. Nahláste to ako chybu." #: ../DistUpgrade/DistUpgradeControler.py:733 @@ -492,6 +501,7 @@ msgstr "Vyhľadávanie zastaraného softvéru" msgid "System upgrade is complete." msgstr "Aktualizácia systému je dokončená." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -503,23 +513,24 @@ msgid "Fetching is complete" msgstr "Aktualizácia je dokončená" #: ../DistUpgrade/DistUpgradeViewGtk.py:129 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li at %s/s" msgstr "Sťahovanie súboru %li z %li pri %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 #: ../DistUpgrade/DistUpgradeViewGtk.py:249 -#, fuzzy +#, fuzzy, python-format msgid "About %s remaining" msgstr "Zostáva %li minút" #: ../DistUpgrade/DistUpgradeViewGtk.py:132 -#, fuzzy +#, fuzzy, python-format msgid "Fetching file %li of %li" msgstr "Sťahujem %li súbor z %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Aplikujem zmeny" @@ -535,8 +546,9 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, fuzzy +#, fuzzy, python-format msgid "" "Replace the customized configuration file\n" "'%s'?" @@ -561,20 +573,21 @@ msgstr "Nastala závažná chyba" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Nahláste to ako chybu a k svojmu hláseniu priložte súbory /var/log/dist-" "upgrade.log a /var/log/dist-upgrade-apt.log. Aktualizácia bude teraz " "prerušená.\n" -"Váš pôvodný súbor 'sources.list' bol uložený ako " -"/etc/apt/sources.list.distUpgrade." +"Váš pôvodný súbor 'sources.list' bol uložený ako /etc/apt/sources.list." +"distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Bude odstránený %s balík." @@ -582,7 +595,7 @@ msgstr[1] "Budú odstránené %s balíky." msgstr[2] "Bude odstránených %s balíkov." #: ../DistUpgrade/DistUpgradeViewGtk.py:492 -#, fuzzy +#, fuzzy, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Bude nainštalovaný %s nový balík." @@ -590,7 +603,7 @@ msgstr[1] "Budú nainštalované %s nové balíky." msgstr[2] "Bude nainštalovaných %s nových balíkov." #: ../DistUpgrade/DistUpgradeViewGtk.py:498 -#, fuzzy +#, fuzzy, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Bude aktualizovaný %s balík." @@ -598,7 +611,7 @@ msgstr[1] "Budú aktualizované %s balíky." msgstr[2] "Bude aktualizovaných %s balíkov." #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -613,16 +626,16 @@ msgstr "" msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." -msgstr "" -"Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená." +msgstr "Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená." #: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pre zamedzenie straty dát, zavrite všetky otvorené programy a dokumenty." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Váš systém je aktuálny" @@ -648,12 +661,12 @@ msgid "Upgrade %s" msgstr "Aktualizovať %s" #: ../DistUpgrade/DistUpgradeView.py:27 -#, fuzzy +#, fuzzy, python-format msgid "%li days %li hours %li minutes" msgstr "Zostáva %li dní %li hodín %li minút" #: ../DistUpgrade/DistUpgradeView.py:29 -#, fuzzy +#, fuzzy, python-format msgid "%li hours %li minutes" msgstr "Zostáva %li hodín %li minút" @@ -668,6 +681,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -689,6 +703,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -801,6 +816,7 @@ msgstr "Nebolo možné stiahnuť poznámky k vydaniu" msgid "Please check your internet connection." msgstr "Skontrolujte si internetové pripojenie." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Nebolo možné spustiť aktualizačný program" @@ -874,12 +890,12 @@ msgstr "" "problémom alebo nedostupňosťou servera. " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, 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:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Sťahovanie súboru %li z %li pri %s/s" @@ -904,15 +920,18 @@ msgstr "" "Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové " "pripojenie." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -928,36 +947,38 @@ msgstr "Ubuntu 5.10 - backporty" msgid "Distribution updates" msgstr "_Pokračovať v aktualizácii" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Nainštalovať _aktualizácie" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Verzia %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Získava sa zoznam zmien..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 #, fuzzy msgid "_Check All" msgstr "_Skontrolovať" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Veľkosť na stiahnutie: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -965,39 +986,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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Čakajte prosím, toto môže chvíľu trvať." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Aktualizácia je dokončená" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Kontrolujem aktualizácie..." -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Nová verzia: %s (veľkosť: %s)" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Verzia %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Vaša distribúcia už nie je podporovaná" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1005,19 +1027,20 @@ msgid "" msgstr "" "Nebudete mať k dispozícii žiadne nové bezpečnostné ani kritické " "aktualizácie. Prejdite preto na najnovšiu verziu distribúcie Ubuntu Linux. " -"Pre viac informácií o prechode na novšiu verziu si pozrite " -"http://www.ubuntu.com.\"" +"Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu." +"com.\"" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "K dispozícii je nové vydanie distribúcie '%s'" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Index softvéru je poškodený" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1027,20 +1050,24 @@ 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 #, fuzzy msgid "None" msgstr "Žiadna" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1317,11 +1344,11 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete " -"pridať\n" +"Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete pridať\n" "\n" -"APT riadok obsahuje typ, umiestnenie a súčasti zdrojov softvéru. Napr.: " -"\"deb·http://ftp.debian.org·sarge·main\"." +"APT riadok obsahuje typ, umiestnenie a súčasti zdrojov softvéru. Napr.: " +"\"deb·http://ftp.debian.org·sarge·main\"." #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1413,206 +1440,250 @@ msgstr "Veľkosť okna" msgid "Configure the sources for installable software and updates" msgstr "Nastaviť zdroje softvéru a internetové aktualizácie" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 - aktualizácie" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Udržiavané komunitou (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Softvér závislý na neslobornom softvéri" +#. Description #: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Udržiavané komunitou (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Udržiavané komunitou (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Udržiavané komunitou (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Neslobodné (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neslobodné (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 - aktualizácie" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 - backporty" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiálne podporované" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 - aktualizácie" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 - backporty" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Udržiavané komunitou (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Neslobodné (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Niektoré programy už nie sú viac oficiálne podporované" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "S obmedzujúcou licenciou" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 bezpečnostné aktualizácie" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 aktualizácie" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 - backporty" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" - bezpečnostné aktualizácie" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Softvér nekompatibilný s DFSG" @@ -1621,7 +1692,6 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "Softvér s obmedzených exportom pre USA" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti" @@ -1645,8 +1715,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "" #~ "Upgrading to Ubuntu 6.10" #~ msgstr "" -#~ "Prebieha aktualizácia na Ubuntu 6.06 " -#~ "LTS" +#~ "Prebieha aktualizácia na Ubuntu " +#~ "6.06 LTS" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1675,18 +1745,17 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "Niektoré aktualizácie vyžadujú odstránenie iných programov. Aby ste vykonali " -#~ "úplnú aktualizáciu použite funkciu \"Označiť všetky aktualizácie\" správcu " -#~ "balíkov \"Synaptic\" alebo spustite \"sudo apt-get dist-upgrade\" v " -#~ "termináli." +#~ "Niektoré aktualizácie vyžadujú odstránenie iných programov. Aby ste " +#~ "vykonali úplnú aktualizáciu použite funkciu \"Označiť všetky aktualizácie" +#~ "\" správcu balíkov \"Synaptic\" alebo spustite \"sudo apt-get dist-upgrade" +#~ "\" v termináli." #~ msgid "The following updates will be skipped:" #~ msgstr "Nasledujúce balíky nebudú aktualizované:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Zostáva %li sekúnd" @@ -1769,15 +1838,15 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgstr "Nebol nájdený žiadny platný záznam" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" -#~ "Vo vašich zdrojoch softvéru nebol nájdený žiadny záznam vhodný na použitie " -#~ "pre upgrade.\n" +#~ "Vo vašich zdrojoch softvéru nebol nájdený žiadny záznam vhodný na " +#~ "použitie pre upgrade.\n" #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "is now run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery is now run (dpkg --configure -a)." #~ msgstr "" #~ "Upgrade neočakávane skončil. Váš systém môže byt v nestabilnom stave. Pre " #~ "opravu skúste teraz spustiť (dpkg --configure -a)." @@ -1786,8 +1855,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ "Please report this as a bug and include the files ~/dist-upgrade.log and " #~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. " #~ msgstr "" -#~ "Oznámte ju ako chybu a k vašej správe priložte súbory ~/dist-upgrade.log a " -#~ "~/dist-upgrade-apt.log. Upgrade teraz skončí. " +#~ "Oznámte ju ako chybu a k vašej správe priložte súbory ~/dist-upgrade.log " +#~ "a ~/dist-upgrade-apt.log. Upgrade teraz skončí. " #~ msgid "You can install one update" #~ msgid_plural "You can install %s updates" @@ -1802,14 +1871,14 @@ msgstr "Softvér nekompatibilný s DFSG" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "Potrebujete znovunačítať zoznam dostupných balíčkov zo serverov uvedených vo " -#~ "vašich zdrojoch softvéru. Chcete to urobiť teraz?" +#~ "Potrebujete znovunačítať zoznam dostupných balíčkov zo serverov uvedených " +#~ "vo vašich zdrojoch softvéru. Chcete to urobiť teraz?" #~ msgid "" #~ "Analysing your system\n" #~ "\n" -#~ "Software updates can correct errors, eliminate security vulnerabilities, and " -#~ "provide new features to you." +#~ "Software updates can correct errors, eliminate security vulnerabilities, " +#~ "and provide new features to you." #~ msgstr "" #~ "Analyzuje sa váš systém\n" #~ "\n" @@ -1817,8 +1886,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ "zraniteľnosti alebo poskytnúť nové vlastnosti." #~ msgid "" -#~ "Software updates can correct errors, eliminate security vulnerabilities, and " -#~ "provide new features to you." +#~ "Software updates can correct errors, eliminate security vulnerabilities, " +#~ "and provide new features to you." #~ msgstr "" #~ "Softvérové aktualizácie môžu opravovať chyby, odstraňovať bezpečnostné " #~ "zraniteľnosti alebo poskytnúť nové vlastnosti." @@ -1829,15 +1898,15 @@ msgstr "Softvér nekompatibilný s DFSG" #~ "installed therefor" #~ msgstr "" #~ "Automaticky budú inštalované len bezpečnostné aktualizácie z oficiálnych " -#~ "serverov Ubuntu. Preto musí byť nainštalovaný softvérový balíček 'unattended-" -#~ "upgrades'." +#~ "serverov Ubuntu. Preto musí byť nainštalovaný softvérový balíček " +#~ "'unattended-upgrades'." #~ msgid "Sections" #~ msgstr "Sekcie:" #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line contains the type, location and sections of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." @@ -1845,8 +1914,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ "Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete " #~ "pridať\n" #~ "\n" -#~ "APT riadok obsahuje typ, umiestnenie a sekcie zdrojov softvéru. Napr.: " -#~ "\"deb·http://ftp.debian.org·sarge·main\"." +#~ "APT riadok obsahuje typ, umiestnenie a sekcie zdrojov softvéru. Napr.: " +#~ "\"deb·http://ftp.debian.org·sarge·main\"." #~ msgid "Sections:" #~ msgstr "Sekcie:" @@ -1878,8 +1947,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ "umožňuje overiť integritu stiahnutého softvéru." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Pridať nový kľúč do zväzku dôveryhodných kľúčov. Uistite sa, že ste kľúč " #~ "dostali bezpečnou cestou, a že môžete veriť jeho vydavateľovi. " @@ -1909,8 +1978,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgstr "Maximálna veľkosť archívu na disku (v MB):" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Obnoví pôvodné kľúče dodávané s vašou distribúciou. Toto neovplyvní " #~ "používateľom nainštalovnané kľúče." @@ -1942,8 +2011,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Dostupné aktualizácie\n" #~ "\n" @@ -2024,7 +2093,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgstr[2] "Vybrali ste %s balíkov na aktualizáciu, veľkosť %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s" #~ msgstr[1] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s" #~ msgstr[2] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s" @@ -2033,8 +2103,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgstr "Práve prebieha aktualizácia." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Môžete mať spustenú najviac jednu aplikáciu na správu balíkov. Prosím, " #~ "najprv zavrite druhú aplikáciu." @@ -2047,8 +2117,8 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Prejdite prosím, na novšiu verziu distribúcie Ubuntu Linux. Verzia, ktorú " #~ "používate nie je viac podporovaná. To znamená, že už nie sú k dispozícii " @@ -2059,12 +2129,12 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgstr "Bola nájdená novšia verzia Ubuntu!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Je dostupná novšia verzia vašej distribúcie s kódovým označením \"%s\". Pre " -#~ "viac informácií o prechode na vyššiu verziu si pozrite " -#~ "http://www.ubuntulinux.org." +#~ "Je dostupná novšia verzia vašej distribúcie s kódovým označením \"%s\". " +#~ "Pre viac informácií o prechode na vyššiu verziu si pozrite http://www." +#~ "ubuntulinux.org." #~ msgid "Never show this message again" #~ msgstr "Už viac nezobrazovať toto upozornenie" @@ -2077,4 +2147,4 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgstr "A_utentifikácia" #~ msgid "Packages to install:" -#~ msgstr "Balíky na inštaláciu:" \ No newline at end of file +#~ msgstr "Balíky na inštaláciu:" diff --git a/po/sl.po b/po/sl.po index dc01145c..a5582fbc 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-08-01 13:08+0000\n" "Last-Translator: Tadej \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " -"n%100==4 ? 2 : 3\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%" +"100==4 ? 2 : 3\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" @@ -56,6 +56,7 @@ msgstr "Po enem mesecu" msgid "After %s days" msgstr "Po %s dnevih" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "Napaka pri odstranitvi kluča" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Kluč, katerega ste izbrali, se ne more odstraniti. Prosim, javite to kot " "napako." @@ -153,7 +155,7 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" "Vaš sistem vsebuje pokvarjene pakete, ki se ne morejo obnoviti s to " -"programsko opremo. \n" +"programsko opremo.\r\n" "Prosim, da popravite te pakete z uporabo synaptic ali apt-get, preden " "nadaljujete." @@ -165,6 +167,7 @@ msgstr "Ne morem nadgraditi zahtevanih meta-paketov" msgid "A essential package would have to be removed" msgstr "Bistven paket se bo moral odstraniti" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Ne morem izračunati nadgradnje" @@ -177,6 +180,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Napaka pristnosti nekaterih paketov" @@ -192,7 +196,7 @@ msgstr "" "paketov." #: ../DistUpgrade/DistUpgradeCache.py:312 -#, fuzzy +#, fuzzy, python-format msgid "Can't install '%s'" msgstr "Ne morem namestiti '%s'" @@ -203,6 +207,7 @@ msgid "" msgstr "" "Nemogoče je bilo namestiti zahtevani paket. Prosim, javite to kot napaka. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Ne morem ugibati meta-paketa" @@ -270,6 +275,7 @@ msgstr "" "izberete 'Yes', vam bo posodobilo vse vhode iz '%s' v '%s'.\n" "Če izberete 'no', se bo posodobitev prekinila." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Proizvedem pomanjkljive izvore?" @@ -337,6 +343,7 @@ msgstr "" "prostora na %s. Izpraznite koš in odstranite začasne pakete prejšnjih " "namesitev z uporabo 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Želite pričeti z nadgradnjo?" @@ -403,6 +410,7 @@ msgstr "" "Med čiščenjem je prišlo do problema. Prosim, poglejte sporočilo spodaj za " "več informacij. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -413,6 +421,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -463,6 +472,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "Nadgrajevanje sistema je dokončano" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -490,6 +500,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -505,6 +516,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -528,13 +540,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -580,8 +593,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -627,6 +641,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -646,6 +661,7 @@ msgstr "Nadgrajevanje je končano in potreben je ponoven zagon" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -751,6 +767,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -840,14 +857,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -860,33 +880,35 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Različica %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Velikost prenosa: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -895,73 +917,79 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1283,184 +1311,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/sq.po b/po/sq.po index 42f6ef44..10e0f7bb 100644 --- a/po/sq.po +++ b/po/sq.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-09-30 21:20+0000\n" "Last-Translator: Alejdin Tirolli \n" "Language-Team: Albanian \n" @@ -55,6 +55,7 @@ msgstr "Pas një muaji" msgid "After %s days" msgstr "Pas %s ditësh" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "%s përmirësimet" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,8 +125,7 @@ msgid "Error removing the key" msgstr "Gabim gjatë largimit të çelësit" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Çelësi i zgjedhur nuk mund të largohet.Ju lutemi krijoni këtu një raport për " "gabimin." @@ -168,6 +170,7 @@ msgstr "Metapaketat e nevojshme nuk mund të aktualizohen." msgid "A essential package would have to be removed" msgstr "Një paketë themelore u deshtë të largohej" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Aktualizimi nuk mund të llogaritej" @@ -182,6 +185,7 @@ msgstr "" "Një problem i pazgjidhshëm ndodhi gjatë aktualizimit.Ju lutemi krijoni një " "raport për këtë gabim." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Gabim gjatë vërtetimit të origjinalitetit të disa paketave." @@ -209,6 +213,7 @@ msgstr "" "Një paketë i nevojshëm nuk mundi të instalohet.Ju lutemi raportoni këtë " "problem. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Can't guess meta-package" @@ -273,6 +278,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -329,6 +335,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -391,6 +398,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -401,6 +409,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -451,6 +460,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -478,6 +488,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -493,6 +504,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -516,13 +528,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -562,8 +575,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -609,6 +623,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -628,6 +643,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -733,6 +749,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -822,14 +839,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -842,106 +862,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1263,184 +1291,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/sr.po b/po/sr.po index 9583ee0a..d433222d 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-06-01 10:04+0000\n" "Last-Translator: Vladimir Samardzic \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" #: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Daily" @@ -56,6 +56,7 @@ msgstr "Posle jednog meseca" msgid "After %s days" msgstr "Posle %s dana" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -124,8 +127,7 @@ msgstr "Грешка у уклањању кључа" #: ../SoftwareProperties/SoftwareProperties.py:993 #, fuzzy -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Кључ који сте изабрали није могуће уклонити. Молим вас пријавите ово као " "грешку." @@ -171,6 +173,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -183,6 +186,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -205,6 +209,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -264,6 +269,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -314,16 +320,17 @@ msgid "Not enough free disk space" msgstr "Нема довољно места на диску" #: ../DistUpgrade/DistUpgradeControler.py:369 -#, fuzzy +#, fuzzy, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"Надоградња је прекинута. Молим вас ослободите најмање %s простора на диску " -"%s. Испразните канту за отпаtке и уклоните привремене пакете предходних " +"Надоградња је прекинута. Молим вас ослободите најмање %s простора на диску %" +"s. Испразните канту за отпаtке и уклоните привремене пакете предходних " "инсталација користећи команду 'sudo apt-get clean'." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -386,6 +393,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -396,6 +404,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -447,6 +456,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "Унапређење система је завршено" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -474,6 +484,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -489,6 +500,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -513,13 +525,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -564,8 +577,9 @@ msgid "To prevent data loss close all open applications and documents." msgstr "" "Да би спречили губитак података затворите све активне програме и документа." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -611,6 +625,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -631,6 +646,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -737,6 +753,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -826,14 +843,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -846,33 +866,35 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -880,73 +902,79 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1268,184 +1296,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/sv.po b/po/sv.po index a6bc08ea..61bc47ff 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-06 03:32+0000\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -56,6 +56,7 @@ msgstr "Efter en månad" msgid "After %s days" msgstr "Efter %s dagar" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "Uppdateringar för %s" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Huvudserver" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -122,8 +125,7 @@ msgid "Error removing the key" msgstr "Fel vid borttagning av nyckeln" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nyckeln du valde kan inte tas bort. Rapportera detta som ett fel." #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -166,6 +168,7 @@ msgstr "Kan inte uppdatera de obligatoriska meta-paketen" 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:220 msgid "Could not calculate the upgrade" msgstr "Kunde inte beräkna uppgraderingen" @@ -182,6 +185,7 @@ msgstr "" "Rapportera det här felet mot paketet \"update-manager\" och inkludera " "filerna i /var/log/dist-upgrade/ i felrapporten." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisiera vissa paket" @@ -209,6 +213,7 @@ msgstr "" "Det var inte möjligt att installera ett nödvändigt paket. Rapportera detta " "som ett fel. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Kan inte gissa meta-paket" @@ -291,6 +296,7 @@ msgstr "" "här kommer det att uppdatera alla \"%s\" till \"%s\".\n" "Om du väljer \"Nej\" kommer uppdateringen avbrytas." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Generera standardkällor?" @@ -362,6 +368,7 @@ msgstr "" "papperskorg och ta bort temporära paket från tidigare installationer genom " "att använda \"sudo apt-get clean\"." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Vill du starta uppgraderingen?" @@ -381,8 +388,8 @@ msgstr "" "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart tillstånd. " "En återhämtning kördes (dpkg --configure -a).\n" "\n" -"Rapportera detta fel mot paketet \"update-manager\" och bifoga filerna i " -"/var/log/dist-upgrade/ i felrapporten." +"Rapportera detta fel mot paketet \"update-manager\" och bifoga filerna i /" +"var/log/dist-upgrade/ i felrapporten." #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -438,6 +445,7 @@ msgstr "" "Något fel inträffade vid upprensningen. Se meddelandet nedan för mer " "information. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Återställer ursprungligt systemtillstånd" @@ -448,6 +456,7 @@ msgid "Fetching backport of '%s'" msgstr "Hämtar bakåtportering av \"%s\"" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -464,8 +473,8 @@ msgid "" "upgrade/ in the bugreport." msgstr "" "Förberedelse av systemet för uppgraderingen misslyckades. Rapportera det här " -"som ett fel mot paketet \"update-manager\" och inkludera filerna i " -"/var/log/dist-upgrade/ i felrapporten." +"som ett fel mot paketet \"update-manager\" och inkludera filerna i /var/log/" +"dist-upgrade/ i felrapporten." #: ../DistUpgrade/DistUpgradeControler.py:695 msgid "Updating repository information" @@ -506,6 +515,7 @@ msgstr "Söker efter föråldrad programvara" msgid "System upgrade is complete." msgstr "Systemuppdateringen är klar." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -533,6 +543,7 @@ msgstr "Hämtar fil %li av %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Verkställer ändringar" @@ -547,9 +558,10 @@ msgid "" "The upgrade aborts now. Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"Uppgraderingen avbryter nu. Rapportera detta fel mot paketet \"update-" -"manager\" och bifoga filerna i /var/log/dist-upgrade/ i felrapporten." +"Uppgraderingen avbryter nu. Rapportera detta fel mot paketet \"update-manager" +"\" och bifoga filerna i /var/log/dist-upgrade/ i felrapporten." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -577,17 +589,18 @@ msgstr "Ett ödesdigert fel uppstod" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"Rapportera detta som ett fel och bifoga filerna /var/log/dist-" -"upgrade/main.log och /var/log/dist-upgrade/apt.log i din rapport. " -"Uppgraderingen avbryts nu.\n" +"Rapportera detta som ett fel och bifoga filerna /var/log/dist-upgrade/main." +"log och /var/log/dist-upgrade/apt.log i din rapport. Uppgraderingen avbryts " +"nu.\n" "Din ursprungliga sources.list sparades som /etc/apt/sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -632,8 +645,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "Stäng alla öppna program och dokument för att förhindra dataförlust." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Ditt system är uppdaterat" @@ -681,6 +695,7 @@ msgid "%li seconds" msgstr "%li sekunder" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -703,6 +718,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -813,6 +829,7 @@ msgstr "Det gick inte att hämta versionsfaktan" msgid "Please check your internet connection." msgstr "Kontrollera din Internetanslutning." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Det gick inte att köra uppgraderingsverktyget" @@ -916,14 +933,17 @@ msgstr "" "Misslyckades med att hämta listan över ändringar. \n" "Kontrollera din Internetanslutning." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Viktiga säkerhetsuppdateringar" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Rekommenderade uppdateringar" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Föreslagna uppdateringar" @@ -936,71 +956,74 @@ msgstr "Bakåtporteringar" msgid "Distribution updates" msgstr "Uppdateringar för utgåva" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Övriga uppdateringar" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "Hämtar lista över ändringar..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "_Avmarkera allt" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Kontrollera alla" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Hämtningsstorlek: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, 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:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Var god vänta, det här kan ta lite tid." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Uppdateringen är färdig" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Letar efter uppdateringar" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Från version %(old_version)s till %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Storlek: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Din distribution stöds inte längre" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1010,16 +1033,17 @@ msgstr "" "Uppgradera till en senare version av Ubuntu Linux. Se http://www.ubuntu.com " "för mer information om hur man uppgraderar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Ny distributionsutgåva \"%s\" finns tillgänglig" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Programindexet är trasigt" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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,19 +1053,23 @@ msgstr "" "pakethanteraren \"Synaptic\" eller kör \"sudo apt-get install -f\" i en " "terminal för att rätta till det här problemet först." +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 msgid "None" msgstr "Ingen" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1402,193 +1430,235 @@ msgstr "Fönsterstorleken" #: ../data/software-properties.desktop.in.h:1 msgid "Configure the sources for installable software and updates" -msgstr "" -"Konfigurera källorna för installerbara programvaror och uppdateringar" +msgstr "Konfigurera källorna för installerbara programvaror och uppdateringar" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 \"Edgy Eft\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Gemenskapsunderhållen" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Properitära drivrutiner för enheter" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Inskränkt programvara" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\"" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS \"Dapper Drake\"" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "Öppen källkodsprogramvara som stöds av Canonical" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Gemenskapsunderhållen (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Öppen källkodsprogramvara underhållen av gemenskapen" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Ickefria drivrutiner" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Properitära drivrutiner för enheter " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Inskränkt programvara (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "Programvara begränsad av upphovsrätt eller juridiska avtal" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Cd-rom med Ubuntu 6.06 LTS \"Dapper Drake\"" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Bakåtporterade uppdateringar" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Bakåtportar" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Stöds officiellt" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Säkerhetsuppdateringar för Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Uppdateringar för Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Bakåtporteringar för Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Gemenskapsunderhållen (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ickefri (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\"" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Stöds inte längre officiellt" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begränsad upphovsrätt" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Säkerhetsuppdateringar för Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Uppdateringar för Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Bakåtporteringar för Ubuntu 4.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Säkerhetsuppdateringar" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://ftp.se.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibel programvara med icke-fria beroenden" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Icke-DFSG-kompatibel programvara" -#, python-format #~ msgid "" #~ "Error scaning the CD\n" #~ "\n" @@ -1599,22 +1669,22 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "%s" #~ msgid "" -#~ "A unresolvable problem occured while calculating the upgrade. Please report " -#~ "this as a bug. " +#~ "A unresolvable problem occured while calculating the upgrade. Please " +#~ "report this as a bug. " #~ msgstr "" #~ "Ett problem uppstod som inte gick att lösa när uppgraderingen beräknades. " #~ "Rapportera detta som ett fel. " #~ 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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." #~ msgstr "" -#~ "Ditt system innehåller varken ubuntu-desktop, kubuntu-desktop eller edubuntu-" -#~ "desktop och det gick inte att identifiera vilken version av Ubuntu du " -#~ "använder.\n" +#~ "Ditt system innehåller varken ubuntu-desktop, kubuntu-desktop eller " +#~ "edubuntu-desktop och det gick inte att identifiera vilken version av " +#~ "Ubuntu du använder.\n" #~ " Installera ett av dessa paket först med synaptic eller apt-get innan du " #~ "fortsätter." @@ -1624,15 +1694,15 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "synaptic." #~ msgstr "" #~ "Vissa tredjepartskällor i din sources.list blev inaktiverade. Du kan " -#~ "återaktivera dem efter uppgraderingen med verktyget \"software-properties\" " -#~ "eller med synaptic." +#~ "återaktivera dem efter uppgraderingen med verktyget \"software-properties" +#~ "\" eller med synaptic." #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "was run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery was run (dpkg --configure -a)." #~ msgstr "" -#~ "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart tillstånd. " -#~ "En återhämtning kördes (dpkg --configure -a)." +#~ "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart " +#~ "tillstånd. En återhämtning kördes (dpkg --configure -a)." #~ msgid "Some software no longer officially supported" #~ msgstr "Viss programvara stöds inte officiellt längre" @@ -1644,14 +1714,13 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "If you don't have 'universe' enabled 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. " +#~ "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. " #~ msgid "Restoring originale system state" #~ msgstr "Återställer ursprunglig systemstatus" -#, python-format #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore.\n" @@ -1661,37 +1730,30 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "nödvändiga paketet \"%s\" längre.\n" #~ "Det här tyder på ett allvarligt fel, rapportera detta som ett fel." -#, python-format #~ msgid "About %li days %li hours %li minutes remaining" #~ msgstr "Ungefär %li dagar, %li timmar och %li minuter återstår" -#, python-format #~ msgid "About %li hours %li minutes remaining" #~ msgstr "Ungefär %li timmar och %li minuter återstår" -#, python-format #~ msgid "About %li minutes remaining" #~ msgstr "Ungefär %li minuter återstår" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "Ungefär %li sekunder återstår" #~ msgid "Download is complete" #~ msgstr "Hämtningen är färdig" -#, python-format #~ msgid "Downloading file %li of %li at %s/s" #~ msgstr "Hämtar fil %li av %li i %s/s" -#, python-format #~ msgid "Downloading file %li of %li" #~ msgstr "Hämtar fil %li av %li" #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "Uppdateringen avbryts nu. Rapportera detta som ett fel." -#, python-format #~ msgid "" #~ "Replace configuration file\n" #~ "'%s'?" @@ -1700,38 +1762,38 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "\"%s\"?" #~ msgid "" -#~ "Please report this as a bug and include the files /var/log/dist-upgrade.log " -#~ "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" +#~ "Please report this as a bug and include the files /var/log/dist-upgrade." +#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts " +#~ "now.\n" #~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." #~ msgstr "" -#~ "Rapportera detta som ett fel och inkludera filerna /var/log/dist-upgrade.log " -#~ "och /var/log/dist-upgrade-apt.log i din rapport. Uppgraderingen avbryts nu.\n" -#~ "Din ursprungliga sources.list sparades i /etc/apt/sources.list.distUpgrade." +#~ "Rapportera detta som ett fel och inkludera filerna /var/log/dist-upgrade." +#~ "log och /var/log/dist-upgrade-apt.log i din rapport. Uppgraderingen " +#~ "avbryts nu.\n" +#~ "Din ursprungliga sources.list sparades i /etc/apt/sources.list." +#~ "distUpgrade." -#, python-format #~ msgid "%s package is going to be removed." #~ msgid_plural "%s packages are going to be removed." #~ msgstr[0] "%s paket kommer att tas bort." #~ msgstr[1] "%s paket kommer att tas bort." -#, python-format #~ msgid "%s new package is going to be installed." #~ msgid_plural "%s new packages are going to be installed." #~ msgstr[0] "%s nytt paket kommer att installeras." #~ msgstr[1] "%s nya paket kommer att installeras." -#, python-format #~ msgid "%s package is going to be upgraded." #~ msgid_plural "%s packages are going to be upgraded." #~ msgstr[0] "%s paket kommer att uppgraderas." #~ msgstr[1] "%s paket kommer att uppgraderas." -#, python-format #~ msgid "You have to download a total of %s." #~ msgstr "Du behöver hämta totalt %s." #~ msgid "" -#~ "The upgrade can take several hours and cannot be canceled at any time later." +#~ "The upgrade can take several hours and cannot be canceled at any time " +#~ "later." #~ msgstr "" #~ "Uppgraderingen kan ta flera timmar och kan inte avbrytas under tiden." @@ -1744,8 +1806,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "" #~ "Upgrading to Ubuntu 6.06 LTS" #~ msgstr "" -#~ "Uppgraderar till Ubuntu 6.06 " -#~ "LTS" +#~ "Uppgraderar till Ubuntu 6.06 LTS" #~ msgid "Downloading and installing the upgrades" #~ msgstr "Hämtar och installerar uppgraderingarna" @@ -1754,17 +1816,15 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Uppgraderar Ubuntu" #~ msgid "" -#~ "Verfing the upgrade failed. There may be a problem with the network or with " -#~ "the server. " +#~ "Verfing the upgrade failed. There may be a problem with the network or " +#~ "with the server. " #~ msgstr "" -#~ "Verifieringen av uppgraderingen misslyckades. Det kan vara ett problem med " -#~ "nätverket eller med servern. " +#~ "Verifieringen av uppgraderingen misslyckades. Det kan vara ett problem " +#~ "med nätverket eller med servern. " -#, python-format #~ msgid "Downloading file %li of %li with %s/s" #~ msgstr "Hämtar fil %li av %li i %s/s" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "Hämtar fil %li av %li med okänd hastighet" @@ -1783,13 +1843,13 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" #~ "Vissa uppdateringar kräver att andra program avinstalleras. Använd " -#~ "funktionen \"Markera alla uppgraderingar\" i pakethanteraren Synaptic eller " -#~ "kör \"sudo apt-get dist-upgrade\" i en terminal för att uppdatera ditt " -#~ "system helt och hållet." +#~ "funktionen \"Markera alla uppgraderingar\" i pakethanteraren Synaptic " +#~ "eller kör \"sudo apt-get dist-upgrade\" i en terminal för att uppdatera " +#~ "ditt system helt och hållet." #~ msgid "The following updates will be skipped:" #~ msgstr "Följande uppdateringar kommer att hoppas över:" @@ -1803,7 +1863,6 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "Show details" #~ msgstr "Visa detaljer" -#, python-format #~ msgid "New version: %s (Size: %s)" #~ msgstr "Ny version: %s (storlek: %s)" @@ -1818,13 +1877,14 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "" #~ "You must check for updates manually\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" #~ "Du måste leta efter uppdateringar manuellt\n" #~ "\n" -#~ "Ditt system letar inte efter uppdateringar automatiskt. Du kan konfigurera " -#~ "detta beteende i \"System\" -> \"Administration\" -> " +#~ "Ditt system letar inte efter uppdateringar automatiskt. Du kan " +#~ "konfigurera detta beteende i \"System\" -> \"Administration\" -> " #~ "\"Programvaruinställningar\"." #~ msgid "" @@ -1865,8 +1925,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "" #~ "The channel information is out-of-date\n" #~ "\n" -#~ "You have to reload the channel information to install software and updates " -#~ "from newly added or changed channels. \n" +#~ "You have to reload the channel information to install software and " +#~ "updates from newly added or changed channels. \n" #~ "\n" #~ "You need a working internet connection to continue." #~ msgstr "" @@ -1884,16 +1944,17 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Komponenter" #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." #~ msgstr "" -#~ "Skriv in hela APT-raden till kanalen du vill lägga till\n" +#~ "Skriv in hela APT-raden till kanalen du vill lägga till\n" #~ "\n" -#~ "APT-raden innehåller typ, plats och komponenter för en kanal, till exempel " -#~ "\"deb http://ftp.debian.org sarge main\"." +#~ "APT-raden innehåller typ, plats och komponenter för en kanal, till " +#~ "exempel \"deb http://ftp.debian.org sarge main\"." #~ msgid "Add Channel" #~ msgstr "Lägg till kanal" @@ -1911,12 +1972,12 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "" #~ "If automatic checking for updates is disabeld, you have to reload the " -#~ "channel list manually. This option allows to hide the reminder shown in this " -#~ "case." +#~ "channel list manually. This option allows to hide the reminder shown in " +#~ "this case." #~ msgstr "" #~ "Om automatisk kontroll av uppdateringar är inaktiverad behöver du läsa om " -#~ "kanallistan manuellt. Det här alternativet möjliggör att dölja påminnelser " -#~ "som visas i det här läget." +#~ "kanallistan manuellt. Det här alternativet möjliggör att dölja " +#~ "påminnelser som visas i det här läget." #~ msgid "" #~ "Stores the state of the expander that contains the list of changs and the " @@ -1948,12 +2009,12 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "" #~ "The upgrade aborts now. Please free at least %s of disk space. Empty your " -#~ "trash and remove temporary packages of former installations using 'sudo apt-" -#~ "get clean'." +#~ "trash and remove temporary packages of former installations using 'sudo " +#~ "apt-get clean'." #~ msgstr "" #~ "Uppdateringen avbryter nu. Vänligen frigör minst %s diskutrymme. Töm din " -#~ "papperskorg och ta bort temporära paket från tidigare installationer genom " -#~ "att köra \"sudo apt-get clean\"." +#~ "papperskorg och ta bort temporära paket från tidigare installationer " +#~ "genom att köra \"sudo apt-get clean\"." #~ msgid "%s remaining" #~ msgstr "%s återstår" @@ -1962,15 +2023,15 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Ingen giltig källa funnen" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "" #~ "Ingen giltig källa för uppdatering hittades när din förrådsinformation " #~ "söktes igenom.\n" #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "is now run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery is now run (dpkg --configure -a)." #~ msgstr "" #~ "Uppdateringen avbryts nu. Ditt system kan vara i ett oanvändbart läge. En " #~ "återställning körs nu (dpkg --configure -a)." @@ -1980,8 +2041,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. " #~ msgstr "" #~ "Var vänlig rapportera detta som en bugg och inkludera filerna ~/dist-" -#~ "upgrade.log och ~/dist-upgrade-apt.log i din rapport. Uppdateringen avbryts " -#~ "nu. " +#~ "upgrade.log och ~/dist-upgrade-apt.log i din rapport. Uppdateringen " +#~ "avbryts nu. " #~ msgid "You can install one update" #~ msgid_plural "You can install %s updates" @@ -2001,17 +2062,17 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "" #~ "Analysing your system\n" #~ "\n" -#~ "Software updates can correct errors, eliminate security vulnerabilities, and " -#~ "provide new features to you." +#~ "Software updates can correct errors, eliminate security vulnerabilities, " +#~ "and provide new features to you." #~ msgstr "" #~ "Analyserar ditt system\n" #~ "\n" -#~ "Programvaruuppdateringar kan åtgärda fel, eliminera säkerhetshål och ge dig " -#~ "nya funktioner." +#~ "Programvaruuppdateringar kan åtgärda fel, eliminera säkerhetshål och ge " +#~ "dig nya funktioner." #~ msgid "" -#~ "Software updates can correct errors, eliminate security vulnerabilities, and " -#~ "provide new features to you." +#~ "Software updates can correct errors, eliminate security vulnerabilities, " +#~ "and provide new features to you." #~ msgstr "" #~ "Programuppdateringar kan åtgärda fel, eliminera säkerhetshål och ge dina " #~ "program nya funktioner." @@ -2021,22 +2082,22 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "automatically. The software package \"unattended-upgrades\" needs to be " #~ "installed therefor" #~ msgstr "" -#~ "Endast säkerhetsuppdateringar från de officiella Ubuntu-servrarna kommer att " -#~ "installeras automatiskt. Programpaketet \"unattended-upgrades\" behöver " -#~ "därför installeras" +#~ "Endast säkerhetsuppdateringar från de officiella Ubuntu-servrarna kommer " +#~ "att installeras automatiskt. Programpaketet \"unattended-upgrades\" " +#~ "behöver därför installeras" #~ msgid "Sections" #~ msgstr "Avdelningar:" #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line contains the type, location and sections of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." #~ msgstr "" -#~ "Skriv in den kompletta APT-raden för kanalen du vill lägga " -#~ "till\n" +#~ "Skriv in den kompletta APT-raden för kanalen du vill lägga till\n" #~ "\n" #~ "APT-raden innehåller typ, plats och avdelningar för kanalen, till exempel " #~ "\"deb http://ftp.debian.org sarge main\"." @@ -2072,8 +2133,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "Need to get the changes from the central server" #~ msgstr "" #~ "Nätverksinställningar\n" -#~ "Använd detta verktyg för att konfigurera det sätt som ditt system kommer åt " -#~ "andra datorer" +#~ "Använd detta verktyg för att konfigurera det sätt som ditt system kommer " +#~ "åt andra datorer" #~ msgid "Show available updates and choose which to install" #~ msgstr "Visa tillgängliga uppdateringar och välj vilka som ska installeras" @@ -2154,7 +2215,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Det går inte att uppgradera alla paket." #~ msgid "Changes not found, the server may not be updated yet." -#~ msgstr "Ändringar kunde inte hittas, servern har kanske inte uppdaterats än." +#~ msgstr "" +#~ "Ändringar kunde inte hittas, servern har kanske inte uppdaterats än." #~ msgid "The updates are being applied." #~ msgstr "Uppdateringarna verkställs." @@ -2163,11 +2225,11 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Uppgradering slutförd" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det andra " -#~ "programmet först." +#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det " +#~ "andra programmet först." #, fuzzy #~ msgid "Updating package list..." @@ -2189,11 +2251,11 @@ msgstr "Icke-DFSG-kompatibel programvara" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det andra " -#~ "programmet först." +#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det " +#~ "andra programmet först." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Initierar och hämtar lista med uppdateringar..." @@ -2349,16 +2411,18 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "Försäkra dig om att du angav e-postadressen och aktiveringskoden korrekt" #~ msgid "" -#~ "Unable to show help because the help files were missing. Please report this " -#~ "to your vendor." +#~ "Unable to show help because the help files were missing. Please report " +#~ "this to your vendor." #~ msgstr "" -#~ "Kan inte visa hjälp eftersom hjälpfilerna saknas. Rapportera detta till din " -#~ "leverantör." +#~ "Kan inte visa hjälp eftersom hjälpfilerna saknas. Rapportera detta till " +#~ "din leverantör." #~ msgid "" -#~ "Unable to show help because there are no applications available to view help." +#~ "Unable to show help because there are no applications available to view " +#~ "help." #~ msgstr "" -#~ "Kan inte visa hjälp eftersom inga program för att visa hjälp är tillgängliga." +#~ "Kan inte visa hjälp eftersom inga program för att visa hjälp är " +#~ "tillgängliga." #~ msgid "Are you sure you want to open %d package information windows?" #~ msgstr "Är du säker på att du vill öppna %d fönster med paketinformation?" @@ -2599,10 +2663,11 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Löser beroenden" #~ msgid "" -#~ "You must agree to the licenses covering this software before installing it." +#~ "You must agree to the licenses covering this software before installing " +#~ "it." #~ msgstr "" -#~ "Du måste acceptera villkoren i licenserna som rör denna programvara innan du " -#~ "kan installera den." +#~ "Du måste acceptera villkoren i licenserna som rör denna programvara innan " +#~ "du kan installera den." #~ msgid "I Agree" #~ msgstr "Jag accepterar" @@ -3103,8 +3168,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Kanalprenumerationer på kanal %s" #~ msgid "" -#~ "You do not have permission to subscribe or unsubscribe from channels. You " -#~ "will be unable to make any changes to the subscriptions." +#~ "You do not have permission to subscribe or unsubscribe from channels. " +#~ "You will be unable to make any changes to the subscriptions." #~ msgstr "" #~ "Du har inte rättighet att prenumerera eller säga upp prenumerationer på " #~ "kanaler. Du kommer inte att kunna göra ändringar i prenumerationer." @@ -3125,8 +3190,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Privilegium" #~ msgid "" -#~ "If you remove superuser privileges from yourself, you will be unable to re-" -#~ "add them.\n" +#~ "If you remove superuser privileges from yourself, you will be unable to " +#~ "re-add them.\n" #~ "\n" #~ "Are you sure you want to do this?" #~ msgstr "" @@ -3248,8 +3313,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Information" #~ msgid "" -#~ "Unable to show help because it was not found or because you don't have any " -#~ "help viewers available." +#~ "Unable to show help because it was not found or because you don't have " +#~ "any help viewers available." #~ msgstr "" #~ "Kan inte visa hjälp eftersom den inte hittades eller eftersom du inte har " #~ "några hjälpvisare tillgängliga." @@ -3359,8 +3424,10 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "Executive Summary" #~ msgstr "Sammanfattning" -#~ msgid "Update packages individually (NOTE: This is an unsupported operation)" -#~ msgstr "Uppdatera paket individuellt (OBSERVERA: Denna operation stöds inte)" +#~ msgid "" +#~ "Update packages individually (NOTE: This is an unsupported operation)" +#~ msgstr "" +#~ "Uppdatera paket individuellt (OBSERVERA: Denna operation stöds inte)" #~ msgid "Actual widget tag" #~ msgstr "Riktig widgettagg" @@ -3504,7 +3571,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Städar upp..." #~ msgid "" -#~ "The packages you requested are being downloaded and installed on your system." +#~ "The packages you requested are being downloaded and installed on your " +#~ "system." #~ msgstr "" #~ "Paketen du begärde håller på att hämtas och installeras på ditt system." @@ -3610,9 +3678,9 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "packages. You must free up some disk space before you can continue. Some " #~ "options include:" #~ msgstr "" -#~ "Du har inte tillräckligt med diskutrymme för att kunna hämta de " -#~ "begärda paketen. Du måste skapa ledigt utrymme innan du kan fortsätta. Det " -#~ "finns en del alternativ:" +#~ "Du har inte tillräckligt med diskutrymme för att kunna hämta " +#~ "de begärda paketen. Du måste skapa ledigt utrymme innan du kan fortsätta. " +#~ "Det finns en del alternativ:" #~ msgid "Removing some packages from your system" #~ msgstr "Tar bort en del paket från ditt system" @@ -3624,13 +3692,14 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Töm din cache." #~ msgid "" -#~ "Warning! There may not be sufficient disk space " -#~ "to install this package, and installation of this package may fail. You " -#~ "should free up some disk space before continuing." +#~ "Warning! There may not be sufficient disk " +#~ "space to install this package, and installation of this package may fail. " +#~ "You should free up some disk space before continuing." #~ msgstr "" #~ "Varning! Det kan finnas otillräckligt med " -#~ "diskutrymme för att installera detta paket, och installation av detta paket " -#~ "kan misslyckas. Du bör skapa en del ledigt diskutrymme innan du fortsätter." +#~ "diskutrymme för att installera detta paket, och installation av detta " +#~ "paket kan misslyckas. Du bör skapa en del ledigt diskutrymme innan du " +#~ "fortsätter." #~ msgid "1 Package" #~ msgstr "1 paket" @@ -3648,24 +3717,25 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "nödvändiga installationer" #~ msgid "Please wait, loading page..." -#~ msgstr "Var vänlig vänta, läser in sidan..." +#~ msgstr "" +#~ "Var vänlig vänta, läser in sidan..." #~ msgid "" #~ "You have no packages from this channel currently installed on your system." #~ msgstr "" -#~ "Du har för närvarande inte några paket från denna kanal installerade på ditt " -#~ "system." +#~ "Du har för närvarande inte några paket från denna kanal installerade på " +#~ "ditt system." #~ msgid "" -#~ "You can visit the channel's about page to " -#~ "get more information about what software is available, or you can go " +#~ "You can visit the channel's about page " +#~ "to get more information about what software is available, or you can go " #~ "directly to the install page to " #~ "install software." #~ msgstr "" -#~ "Du kan besöka kanalens om-sida för att få " -#~ "mer information om vilken programvara som är tillgänglig, eller gå direkt " -#~ "till installationssidan för att " -#~ "installera program." +#~ "Du kan besöka kanalens om-sida för att " +#~ "få mer information om vilken programvara som är tillgänglig, eller gå " +#~ "direkt till installationssidan för " +#~ "att installera program." #~ msgid "View the about page." #~ msgstr "Visa om-sidan." @@ -3677,8 +3747,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Gå tillbaka till sammanfattningen." #~ msgid "" -#~ "You don't have any packages installed from this channel. The following pre-" -#~ "defined sets of packages are available, or you may select individual " +#~ "You don't have any packages installed from this channel. The following " +#~ "pre-defined sets of packages are available, or you may select individual " #~ "packages from the Install page." #~ msgstr "" #~ "Du har inga paket installerade från denna kanal. Följande fördefinierade " @@ -3686,37 +3756,37 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "href=updater:available_page>installationssidan." #~ msgid "" -#~ "To install new software from this channel, visit the install page." +#~ "To install new software from this channel, visit the install page." #~ msgstr "" -#~ "För att installera ny programvara går du till installationssidan." +#~ "För att installera ny programvara går du till installationssidan." #~ msgid "" -#~ "To remove already installed software from this channel, visit the remove page." +#~ "To remove already installed software from this channel, visit the remove page." #~ msgstr "" -#~ "För att ta bort redan installerad programvara från denna kanal går du till " -#~ "borttagningssidan." +#~ "För att ta bort redan installerad programvara från denna kanal går du " +#~ "till borttagningssidan." #~ msgid "Unsubscribe from this channel." #~ msgstr "" -#~ "Säg upp prenumerationen på denna " -#~ "kanal." +#~ "Säg upp prenumerationen på " +#~ "denna kanal." #~ msgid "" -#~ "There is 1 update available in this channel, totalling %s of " -#~ "data to be downloaded." +#~ "There is 1 update available in this channel, totalling %s " +#~ "of data to be downloaded." #~ msgstr "" #~ "Det finns 1 uppdatering tillgänglig i denna kanal, som kräver att " #~ "%s data hämtas." #~ msgid "" -#~ "There are %s updates available in this channel, totalling %s " -#~ "of data to be downloaded." +#~ "There are %s updates available in this channel, totalling %s of data to be downloaded." #~ msgstr "" -#~ "Det finns %s uppdateringar tillgängliga i denna kanal, som kräver att " -#~ "%s data hämtas." +#~ "Det finns %s uppdateringar tillgängliga i denna kanal, som kräver " +#~ "att %s data hämtas." #~ msgid "Essential Updates" #~ msgstr "Nödvändiga uppdateringar" @@ -3748,34 +3818,36 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ "ditt system.

" #~ msgid "" -#~ "

You can go to the Update page to view " -#~ "available updates for your software in this channel, or return to the Summary to view all available updates.

" +#~ "

You can go to the Update page to " +#~ "view available updates for your software in this channel, or return to " +#~ "the Summary to view all available updates." +#~ "

" #~ msgstr "" -#~ "

Du kan gå till uppdateringssidan för " -#~ "att se de uppdateringar till din programvara som finns i denna kanal, eller " -#~ "gå tillbaka till sammanfattningen för att se " -#~ "alla tillgängliga uppdateringar.

" +#~ "

Du kan gå till uppdateringssidan " +#~ "för att se de uppdateringar till din programvara som finns i denna kanal, " +#~ "eller gå tillbaka till sammanfattningen " +#~ "för att se alla tillgängliga uppdateringar.

" #~ msgid "" #~ "

You can go to the Summary to view all " #~ "available updates for your system.

" #~ msgstr "" -#~ "

Du kan gå till sammanfattningen för att " -#~ "se alla uppdateringar som är tillgängliga för ditt system.

" +#~ "

Du kan gå till sammanfattningen för " +#~ "att se alla uppdateringar som är tillgängliga för ditt system.

" #~ msgid "" #~ "The following packages from this channel are available for " #~ "installation." #~ msgstr "" -#~ "Följande paket från denna kanal är tillgängliga för installation." +#~ "Följande paket från denna kanal är tillgängliga för " +#~ "installation." #~ msgid "" -#~ " Package names that are in gray indicate that " -#~ "a newer version of this package is already installed." +#~ " Package names that are in gray indicate " +#~ "that a newer version of this package is already installed." #~ msgstr "" -#~ " Paketnamn som är grå indikerar att en nyare " -#~ "version av detta paket redan är installerat." +#~ " Paketnamn som är grå indikerar att en " +#~ "nyare version av detta paket redan är installerat." #~ msgid "Name:" #~ msgstr "Namn:" @@ -3817,18 +3889,18 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Du prenumererar för närvarande på alla tillgängliga kanaler!" #~ msgid "" -#~ "There is one update available for your system, totalling %s of " -#~ "data to be downloaded." +#~ "There is one update available for your system, totalling %s " +#~ "of data to be downloaded." #~ msgstr "" -#~ "Det finns en uppdatering tillgänglig för ditt system, som kräver att " -#~ "%s data hämtas." +#~ "Det finns en uppdatering tillgänglig för ditt system, som kräver " +#~ "att %s data hämtas." #~ msgid "" -#~ "There are %s updates available for your system, totalling %s " -#~ "of data to be downloaded." +#~ "There are %s updates available for your system, totalling %s of data to be downloaded." #~ msgstr "" -#~ "Det finns %s uppdateringar tillgängliga för ditt system, som kräver " -#~ "att %s data hämtas." +#~ "Det finns %s uppdateringar tillgängliga för ditt system, som " +#~ "kräver att %s data hämtas." #~ msgid " Of these updates, one is urgent." #~ msgstr " Utav dessa uppdateringar är en brådskande." @@ -3846,7 +3918,8 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Synlig felsökningsnivå, går från 0 (ingenting) till 6 (allting)" #~ msgid "Log file debugging level, ranges from 0 (nothing) to 6 (everything)" -#~ msgstr "Felsökningsnivå för loggfil, går från 0 (ingenting) till 6 (allting)" +#~ msgstr "" +#~ "Felsökningsnivå för loggfil, går från 0 (ingenting) till 6 (allting)" #~ msgid "The XAuthority file (usually from GDM)" #~ msgstr "XAuthority-filen (vanligtvis från GDM)" @@ -3865,11 +3938,11 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgstr "Hämtar kanalgrafik..." #~ msgid "" -#~ "An error occurred trying to parse the channel list. You should ensure that " -#~ "you are running a supported distribution and try again later." +#~ "An error occurred trying to parse the channel list. You should ensure " +#~ "that you are running a supported distribution and try again later." #~ msgstr "" -#~ "Ett fel inträffade vid försök att tolka kanallistan. Du bör försäkra dig om " -#~ "att du använder en distribution som stöds och försöka igen senare." +#~ "Ett fel inträffade vid försök att tolka kanallistan. Du bör försäkra dig " +#~ "om att du använder en distribution som stöds och försöka igen senare." #~ msgid "Navigation" #~ msgstr "Navigering" @@ -4075,4 +4148,4 @@ msgstr "Icke-DFSG-kompatibel programvara" #~ msgid "translator-credits" #~ msgstr "" #~ "Christian Rose\n" -#~ "Skicka synpunkter på översättningen till sv@li.org" \ No newline at end of file +#~ "Skicka synpunkter på översättningen till sv@li.org" diff --git a/po/ta.po b/po/ta.po index cf08e19a..5766fa79 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-08-04 02:52+0000\n" "Last-Translator: Raghavan \n" "Language-Team: Tamil \n" @@ -55,6 +55,7 @@ msgstr "ஒரு மாதத்திற்க்கு பின்" msgid "After %s days" msgstr "%s நாட்களுக்கு பிறகு" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -120,8 +123,7 @@ msgid "Error removing the key" msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -158,6 +160,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -170,6 +173,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -192,6 +196,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -251,6 +256,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -309,6 +315,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -371,6 +378,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -381,6 +389,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -433,6 +442,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "கணிணி மேம்பாடு முடிந்தது." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -460,6 +470,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -475,6 +486,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -499,13 +511,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -545,8 +558,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -592,6 +606,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -612,6 +627,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -717,6 +733,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -806,14 +823,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -826,106 +846,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1247,184 +1275,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/po/th.po b/po/th.po index 1d64a830..17a80581 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:44+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" @@ -54,6 +54,7 @@ msgstr "หลังจาก 1 เดือน" msgid "After %s days" msgstr "หลังจาก %s วัน" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "%s ปรับปรุง" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "เซิร์ฟเวอร์หลัก" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -119,8 +122,7 @@ msgid "Error removing the key" msgstr "มีปัญหาขณะลบกุจแจ" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -151,8 +153,8 @@ msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -"ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ " -"กรุณาซ่อมโดยใช้โปรแกรม synaptic หรือ apt-get ก่อนดำเนินการต่อไป" +"ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic " +"หรือ apt-get ก่อนดำเนินการต่อไป" #: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" @@ -162,6 +164,7 @@ msgstr "ไม่สามารถปรับปรุง meta แพกเก msgid "A essential package would have to be removed" msgstr "แพจเกจที่สำคัญจะถูกลบออก" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "ไม่สามารถคำนวนการปรับปรุงได้" @@ -178,6 +181,7 @@ msgstr "" "กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' และแนบไฟล์ใน /var/log/dist-" "upgrade/ ในรายงานด้วย" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ" @@ -188,9 +192,8 @@ msgid "" "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -"ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ " -"นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย คุณอาจจะลองอีกครั้งภายหลังก็ได้ " -"กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน" +"ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย " +"คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน" #: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format @@ -203,6 +206,7 @@ msgid "" "bug. " msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้" @@ -217,8 +221,8 @@ msgid "" msgstr "" "ระบบของคุณไม่มีอูบันตูเดสก์ท็อป คูบันตูเดสก์ท็อป หรือ เอ็ดดูบันตูเดกส์ท็อป " "แพกเกจและไม่สามารถที่จะตรวจสอบได้ว่าคุณใช้อูบันตูรุ่นไหนอยู่\n" -" กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic " -"หรือโปรแกรม apt-get ก่อนดำเนินการต่อไป" +" กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic หรือโปรแกรม apt-get " +"ก่อนดำเนินการต่อไป" #: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" @@ -233,8 +237,7 @@ msgid "" "The error message was:\n" "'%s'" msgstr "" -"มีปัญหาในการเพิ่มซีดีการปรับปรุงรุ่นจะถูกยกเลิก " -"กรุณารายงานปัญหานี้ถ้าเป็นซีดีที่ถูกต้องของอูบันตู\n" +"มีปัญหาในการเพิ่มซีดีการปรับปรุงรุ่นจะถูกยกเลิก กรุณารายงานปัญหานี้ถ้าเป็นซีดีที่ถูกต้องของอูบันตู\n" "\n" "ปัญหาคือ : \n" "'%s'" @@ -254,10 +257,9 @@ msgid "" "If you have fast or inexpensive network access you should answer 'Yes' here. " "If networking is expensive for you choose 'No'." msgstr "" -"การปรับปรุงรุ่นสามารถใช้เครือข่ายเพื่อตรวจเช็คว่ามีรุ่นล่าสุดหรือไม่ " -"่และดึงแพ็กเกจอื่นๆที่ไม่อยู่ในแผ่นซีดี\n" -"ถ้าคุณติดต่อเครือข่ายได้โดยไม่เสียค่าใช้จ่ายมาก และมีความเร็วสูงคุณควรจะตอบ " -"'ตกลง' ถ้าค่าใช้จ่ายในการใช้เครือข่ายแพงสำหรับคุณเลือก 'ไม่'" +"การปรับปรุงรุ่นสามารถใช้เครือข่ายเพื่อตรวจเช็คว่ามีรุ่นล่าสุดหรือไม่ ่และดึงแพ็กเกจอื่นๆที่ไม่อยู่ในแผ่นซีดี\n" +"ถ้าคุณติดต่อเครือข่ายได้โดยไม่เสียค่าใช้จ่ายมาก และมีความเร็วสูงคุณควรจะตอบ 'ตกลง' " +"ถ้าค่าใช้จ่ายในการใช้เครือข่ายแพงสำหรับคุณเลือก 'ไม่'" #: ../DistUpgrade/DistUpgradeControler.py:248 msgid "No valid mirror found" @@ -275,14 +277,13 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" "ไม่เจอรายการของเซิรฟ์เวอร์เสริมสำหรับปรับปรุงขณะที่ตรวจสอบแหล่งข้อมูลของคุณ " -"นี" -"่อาจจะเกิดขึ้นได้ถ้าคุณใช้เซิรฟ์เวอร์เสริมภายในหรือข้อมูลของเซิรฟ์เวอร์เสริม" -"ล้าสมัย\n" +"นี่อาจจะเกิดขึ้นได้ถ้าคุณใช้เซิรฟ์เวอร์เสริมภายในหรือข้อมูลของเซิรฟ์เวอร์เสริมล้าสมัย\n" "\n" -"คุณต้องการที่จะเขียนทับไฟล์ 'sources.list' ของคุณหรือไม่? ถ้าคุณเลือก " -"'Yes' ตรงนี้มันจะถูกปรับปรุงรายการทั้งหมดจาก '%s' to '%s' \n" +"คุณต้องการที่จะเขียนทับไฟล์ 'sources.list' ของคุณหรือไม่? ถ้าคุณเลือก 'Yes' " +"ตรงนี้มันจะถูกปรับปรุงรายการทั้งหมดจาก '%s' to '%s' \n" "ถ้าคุณเลือก 'no' การปรับปรุงจะถูกยกเลิก" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "สร้าง default sources?" @@ -307,8 +308,7 @@ msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บ msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." -msgstr "" -"การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา" +msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา" #: ../DistUpgrade/DistUpgradeControler.py:308 msgid "Third party sources disabled" @@ -348,9 +348,9 @@ msgid "" "apt-get clean'." msgstr "" "การปรับปรุงถูกยกเลิกแล้ว กรุณาฟรีอย่างน้อย %s ของดิสก์พื้นที่บน %s " -"เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-" -"get clean'" +"เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?" @@ -367,8 +367,8 @@ msgid "" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง " -"โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --configure -a)\n" +"การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --" +"configure -a)\n" "\n" "กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' และแนบไฟล์ใน /var/log/dist-" "upgrade/ ในรายงานด้วย" @@ -382,8 +382,8 @@ msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -"การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ " -"installation mediaและลองอีกครั้ง " +"การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation " +"mediaและลองอีกครั้ง " #: ../DistUpgrade/DistUpgradeControler.py:516 msgid "Support for some applications ended" @@ -397,9 +397,8 @@ msgid "" "If you have not enabled community maintained software (universe), these " "packages will be suggested for removal in the next step." msgstr "" -"" -"แพกเกจเหล่านีไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้วและตอนนี้ได้รับสนับสนุนจาก" -"ชุมชน แต่เพียงอย่างเดียว\n" +"แพกเกจเหล่านีไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้วและตอนนี้ได้รับสนับสนุนจากชุมชน " +"แต่เพียงอย่างเดียว\n" "\n" "ถ้าคุณไม่ได้เลือกใช ้แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป" @@ -423,10 +422,9 @@ msgstr "เกิดข้อผิดพลาดขณะแก้ไขปร msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " -msgstr "" -"เกิดปัญหาขึ้นขณะทำการเก็บกวาด " -"กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม " +msgstr "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "คืนระบบสู่สถานะแรกเริ่ม" @@ -437,6 +435,7 @@ msgid "Fetching backport of '%s'" msgstr "ดึงพอร์ตย้อนหลังของ '%s'" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -453,9 +452,7 @@ msgid "" "Preparing the system for the upgrade failed. Please report this as a bug " "against the 'update-manager' package and include the files in /var/log/dist-" "upgrade/ in the bugreport." -msgstr "" -"ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง " -"กรุณารายงานว่านี่เป็นปัญหา" +msgstr "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา" #: ../DistUpgrade/DistUpgradeControler.py:695 msgid "Updating repository information" @@ -494,6 +491,7 @@ msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย" msgid "System upgrade is complete." msgstr "ปรับปรุงระบบเสร็จแล้ว" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -521,6 +519,7 @@ msgstr "กำลังดึงไฟล์ %li จาก %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "กำลังเปลี่ยนแปลง" @@ -535,9 +534,10 @@ msgid "" "The upgrade aborts now. Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"การปรับปรุงรุ่นถูกยกเลิกแล้ว กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-" -"manager' และ กรุณาแนบไฟล์ใน /var/log/dist-upgrade/ ในรายงานด้วย" +"การปรับปรุงรุ่นถูกยกเลิกแล้ว กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' และ " +"กรุณาแนบไฟล์ใน /var/log/dist-upgrade/ ในรายงานด้วย" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -563,17 +563,17 @@ msgstr "เกิดข้อผิดพลาดอย่างร้ายแ #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"กรุณารายงานปัญหานี้และแนบไฟล์ใน /var/log/dist-upgrade/main.log and " -"/var/log/dist-upgrade/apt.log มาในรายงานของคุณด้วย การปรับปรุงถูกยกเลิก\n" -"ไฟล์ sources.list อันเดิมของคุณถูกเก็บไว้ที่ " -"/etc/apt/sources.list.distUpgrade" +"กรุณารายงานปัญหานี้และแนบไฟล์ใน /var/log/dist-upgrade/main.log and /var/log/dist-" +"upgrade/apt.log มาในรายงานของคุณด้วย การปรับปรุงถูกยกเลิก\n" +"ไฟล์ sources.list อันเดิมของคุณถูกเก็บไว้ที่ /etc/apt/sources.list.distUpgrade" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -593,7 +593,7 @@ msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d แพกเกจจะถูกปรับปรุงรุ่น" #: ../DistUpgrade/DistUpgradeViewGtk.py:503 -#, fuzzy +#, fuzzy, python-format msgid "" "\n" "\n" @@ -607,16 +607,15 @@ msgstr "" msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." -msgstr "" -"ดาวน์โหลดและติดตั้งอาจจะใช้เวลานานหลายชั่วโมง " -"และไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป" +msgstr "ดาวน์โหลดและติดตั้งอาจจะใช้เวลานานหลายชั่วโมง และไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป" #: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "เพื่อป้องกันข้อมูลสูญหายกรุณาออกจากทุกโปรแกรมและเอกสารที่เปิดอยู่" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "ระบบของคุณทันสมัยแล้ว" @@ -662,6 +661,7 @@ msgid "%li seconds" msgstr "%li วินาที" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -676,13 +676,12 @@ msgstr "ต้องเริ่มระบบใหม่" #: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" -msgstr "" -"การปรับปรุงเสร็จสิ้นแล้วและต้องการที่จะเริ่มระบบใหม่ " -"คุณต้องการที่จะทำเดี๋ยวนี้หรือเปล่า?" +msgstr "การปรับปรุงเสร็จสิ้นแล้วและต้องการที่จะเริ่มระบบใหม่ คุณต้องการที่จะทำเดี๋ยวนี้หรือเปล่า?" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -697,8 +696,7 @@ msgid "" msgstr "" "ต้องการยกเลิกการปรับปรุงที่กำลังทำอยู่หรือไม่?\n" "\n" -"ระบบอาจจะไม่มั่นคงถ้าคุณยกเลิกการปรับปรุง " -"ขอแนะนำเป็นอย่างยิ่งให้คุณดำเนินการปรับปรุงต่อไป" +"ระบบอาจจะไม่มั่นคงถ้าคุณยกเลิกการปรับปรุง ขอแนะนำเป็นอย่างยิ่งให้คุณดำเนินการปรับปรุงต่อไป" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" @@ -794,6 +792,7 @@ msgstr "ไม่สามารถดาวน์โหลดบันทึก msgid "Please check your internet connection." msgstr "กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "ไม่สามารถเรียกใช้เครื่องมือปรับปรุง" @@ -835,9 +834,7 @@ msgstr "ไม่สามารถเอาออกมาได้" msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " -msgstr "" -"ไม่สามารถแกะข้อมูลปรับปรุงออกมาได้ " -"อาจจะเป็นปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " +msgstr "ไม่สามารถแกะข้อมูลปรับปรุงออกมาได้ อาจจะเป็นปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " #: ../UpdateManager/DistUpgradeFetcher.py:221 msgid "Verfication failed" @@ -847,8 +844,7 @@ msgstr "ไม่สามารถตรวจเช็คความถูก msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " -msgstr "" -"ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิร์ฟเวอร์ " +msgstr "ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิร์ฟเวอร์ " #: ../UpdateManager/DistUpgradeFetcher.py:228 msgid "Authentication failed" @@ -858,15 +854,13 @@ msgstr "ไม่สามารถยืนยันว่าเป็นขอ msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " -msgstr "" -"ยืนยันการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " +msgstr "ยืนยันการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " #: ../UpdateManager/GtkProgress.py:108 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -"กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li ด้วยความเร็ว " -"%(speed)s/s" +"กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li ด้วยความเร็ว %(speed)s/s" #: ../UpdateManager/GtkProgress.py:113 #, python-format @@ -890,17 +884,19 @@ msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -"ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง " -"กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" +"ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "ปรับปรุงด้านความปลอดภัยที่สำคัญ" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "การปรับปรุงที่แนะนำให้ทำ" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "การปรับปรุงที่เสนอให้ทำ" @@ -913,71 +909,74 @@ msgstr "พอร์ตย้อนหลัง" msgid "Distribution updates" msgstr "ปรับปรุงชุดเผยแพร่" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "_ปรับปรุงอื่นๆ" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "รุ่น %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "ไ_ม่เลือกทั้งหมด" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "เ_ลือกทั้งหมด" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "ขนาดดาวน์โหลด: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "ปรับปรุงเสร็จสิ้นแล้ว" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "กำลังตรวจหาข้อมูลปรับปรุง" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "จากรุ่นเก่า: %(old_version)s ไปสู่รุ่นใหม่ %(new_version)s" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "รุ่น %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(ขนาด: %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -987,38 +986,42 @@ msgstr "" "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com " "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "มีชุดแจกจ่ายใหม่ '%s' " -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "ดัชนีของซอฟแวร์เสียหาย" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 "" -"ไม่สามารถที่จะติดตั้งหรือลบออกซอฟแวร์ใดๆ กรุณาใช้โปรแกรมจัดการแพกเกจ " -"\"Synaptic\" หรือ คำสั่ง \"sudo apt-get install -f\" " -"ในเทอร์มินัลเพื่อที่จะแก้ปัญหานี้ก่อน" +"ไม่สามารถที่จะติดตั้งหรือลบออกซอฟแวร์ใดๆ กรุณาใช้โปรแกรมจัดการแพกเกจ \"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 "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1033,8 +1036,8 @@ msgid "" msgstr "" "คุณต้องตรวจหารายการปรับปรุงด้วยตนเอง\n" "\n" -"ระบบของคุณไม่ตรวจหารายการปรับปรุงโดยอัตโนมัตื " -"คุณสามารถปรับแต่งในแหล่งข้อมูลในแถบปรับปรุงทางอินเทอร์เน็ต" +"ระบบของคุณไม่ตรวจหารายการปรับปรุงโดยอัตโนมัตื คุณสามารถปรับแต่งในแหล่งข้อมูลในแถบปรับปรุงทางอินเทอร์เน็ต" #: ../data/glade/UpdateManager.glade.h:4 msgid "Keep your system up-to-date" @@ -1081,8 +1084,8 @@ msgid "" msgstr "" "ดำเนินการปรับปรุงชุดเผยแพร่ ทำการติดตั้งปรับปรุงมากที่สุดเท่าที่จะทำได้ \n" "\n" -"นี่อาจจะมีเหตุมาจากการปรับปรุงที่ไม่เสร็จสิ้น " -"ซอฟต์แวร์แพ็กเกจที่ไม่สนับสนุนอย่างเป็นทางการ หรือใช้รุ่นที่ยังพัฒนาไม่เสร็จ" +"นี่อาจจะมีเหตุมาจากการปรับปรุงที่ไม่เสร็จสิ้น ซอฟต์แวร์แพ็กเกจที่ไม่สนับสนุนอย่างเป็นทางการ " +"หรือใช้รุ่นที่ยังพัฒนาไม่เสร็จ" #: ../data/glade/UpdateManager.glade.h:16 msgid "Show progress of single files" @@ -1096,8 +1099,7 @@ msgstr "ซอฟต์แวร์ปรับปรุง" msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." -msgstr "" -"ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" +msgstr "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" #: ../data/glade/UpdateManager.glade.h:19 msgid "U_pgrade" @@ -1158,8 +1160,7 @@ msgid "" "The results are used to improve the support for popular applications and to " "rank applications in the search results." msgstr "" -"เพื่อที่จะเพิ่มประสพการณ์ให้แก่ผู้ใช้อูบันตู " -"กรุณาเข้าร่วนในการแข่งขันความนิยม ถ้าคุณร่วมด้วย " +"เพื่อที่จะเพิ่มประสพการณ์ให้แก่ผู้ใช้อูบันตู กรุณาเข้าร่วนในการแข่งขันความนิยม ถ้าคุณร่วมด้วย " "รายการของซอฟต์แวร์ที่ติดตั้งและความถี่ในการเรียกใช้งานจะถูกเก็บไว้ " "และส่งโดยไม่ระบุชื่อไปที่โครงการอูบันตูอาทิตย์ละครั้ง\n" "\n" @@ -1194,10 +1195,7 @@ msgstr "ปรัปรุงทางอินเทอร์เน็ต" msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" -msgstr "" -"" -"การปรับปรุงด้านความปลอดภัยจะติดตั้งโดยอัตโนมัติจากเซิรฟ์เวอร์ทางการของอูบันตูเ" -"ท่านั้น" +msgstr "การปรับปรุงด้านความปลอดภัยจะติดตั้งโดยอัตโนมัติจากเซิรฟ์เวอร์ทางการของอูบันตูเท่านั้น" #: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore _Defaults" @@ -1288,11 +1286,10 @@ msgid "" "The APT line includes the type, location and components of a repository, for " "example \"deb http://ftp.debian.org sarge main\"." msgstr "" -"กรุณาเติมให้ครบบรรทัด APT " -"ของแหล่งข้อมูลที่คุณต้องการจะเพิ่ม\n" +"กรุณาเติมให้ครบบรรทัด APT ของแหล่งข้อมูลที่คุณต้องการจะเพิ่ม\n" "\n" -"บรรทัด APT ประกอบด้วย ชนิด,สถานที่,ส่วนประกอบของแหล่งข้อมูล เช่น \"deb " -"http://ftp.debian.org sarge main\"" +"บรรทัด APT ประกอบด้วย ชนิด,สถานที่,ส่วนประกอบของแหล่งข้อมูล เช่น \"deb http://ftp." +"debian.org sarge main\"" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1335,9 +1332,7 @@ msgid "" "Check automatically if a new version of the current distribution is " "available and offer to upgrade (if possible)." msgstr "" -"" -"ตรวจหาโดยอัตโนมัติว่ารุ่นใหม่ของชุดเผยแพร่นี้มีหรือยังและสามารถใช้ปรับปรุงรุ่น" -"ได้(ถ้าเป็นไปได้)" +"ตรวจหาโดยอัตโนมัติว่ารุ่นใหม่ของชุดเผยแพร่นี้มีหรือยังและสามารถใช้ปรับปรุงรุ่นได้(ถ้าเป็นไปได้)" #: ../data/update-manager.schemas.in.h:2 msgid "Check for new distribution releases" @@ -1349,8 +1344,7 @@ msgid "" "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" -"ถ้าการตรวจสอบสำหรับปรับปรุงโดยอัตโนมัติถูกปิดไว้ " -"คุณจะต้องโหลดช่องรายการใหม่เอง " +"ถ้าการตรวจสอบสำหรับปรับปรุงโดยอัตโนมัติถูกปิดไว้ คุณจะต้องโหลดช่องรายการใหม่เอง " "ตัวเลือกนี้ทำให้ซ่อนคำเตือนที่จะแสดงในกรณีนี้ได้" #: ../data/update-manager.schemas.in.h:4 @@ -1379,192 +1373,235 @@ msgstr "ขนาดของหน้าต่าง" msgid "Configure the sources for installable software and updates" msgstr "ปรับแต่งแหล่งสำหรับซอฟต์แวร์และปรับปรุงที่ติดตั้งได้" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "อูบันตู 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "ชุมชนดูแล" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "ซอฟต์แวร์จำกัดการใช้งาน" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "ซีดีรอมที่มีอูบันตู 6.10 'Edgy Eft'" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "อูบันตู 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "ชุมชนดูแล (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "ชุมชนดูแล (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "ชุมชนดูแล ซอฟต์แวร์แบบเปิดเผย" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "ไดรเวอร์ที่ไม่ฟรี" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์ " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "ซอฟต์แวร์จำกัดการใช้งาน(Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "ซีดีรอมที่มีอูบันตู 6.06 LST 'Dapper Drake'" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "การปรับปรุงแบบย้อนหลัง" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "อูบันตู 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "อูบันตู 5.10 Security Updates" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "อูบันตู 5.10 Updates" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "อูบันตู 5.10 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "อูบันตู 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "สนับสนุนอย่างเป็นทางการ" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "อูบันตู 5.04 ปรับปรุง" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "อูบันตู 5.04 พอร์ตย้อนหลัง" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "อูบันตู 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "ชุมชนดูแล (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "ไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "จำกัดลิขสิทธิ์" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "อูบันตู 4.10 ปรับปรุงด้านความปลอดภัย" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "อูบันตู 4.10 ปรับปรุง" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "อูบันตู 4.10 พอร์ตย้อนหลัง" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "เดเบียน 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "เดเบียน 3.1 \"Sarge\" ปรับปรุงด้านความปลอดภัย" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "เดเบียน \"Etch\" (กำลังทดสอบ)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "เดเบียน \"Sid\" (ผันผวน)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอยู่กับไม่ฟรี" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว" @@ -1616,17 +1653,16 @@ msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "การปรับปรุงบางอันต้องการที่จะลบซอฟแวร์ออกอีก กรุณาใช้ตัวเลือก \"Mark All " -#~ "Upgrades\" ของโปรแกรมจัดการแพกเกจ \"Synaptic\" หรือใช้คำสั่ง \"sudo apt-get " -#~ "dist-upgrade\" ในเทอร์มินัล ในการปรับปรุงระบบของคุณให้เสร็จสิ้นสมบรูณ์" +#~ "การปรับปรุงบางอันต้องการที่จะลบซอฟแวร์ออกอีก กรุณาใช้ตัวเลือก \"Mark All Upgrades\" " +#~ "ของโปรแกรมจัดการแพกเกจ \"Synaptic\" หรือใช้คำสั่ง \"sudo apt-get dist-upgrade" +#~ "\" ในเทอร์มินัล ในการปรับปรุงระบบของคุณให้เสร็จสิ้นสมบรูณ์" #~ msgid "The following updates will be skipped:" #~ msgstr "การปรับปรุงต่อไปนี้จะถูกข้ามไป:" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "เหลือประมาณ %li วินาที" @@ -1700,12 +1736,12 @@ msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" #~ msgid "" #~ "The upgrade aborts now. Please free at least %s of disk space. Empty your " -#~ "trash and remove temporary packages of former installations using 'sudo apt-" -#~ "get clean'." +#~ "trash and remove temporary packages of former installations using 'sudo " +#~ "apt-get clean'." #~ msgstr "" #~ "การปรับปรุงถูกยกเลิก กรุณาทำให้มีพื้นที่ว่างในดิสก์อย่างน้อย %s " -#~ "เทถังขยะทิ้งและลบทิ้งแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo " -#~ "apt-get clean'." +#~ "เทถังขยะทิ้งและลบทิ้งแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get " +#~ "clean'." #~ msgid "%s remaining" -#~ msgstr "%s เหลืออีก" \ No newline at end of file +#~ msgstr "%s เหลืออีก" diff --git a/po/tr.po b/po/tr.po index 6d03541f..7eb08d54 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-09-27 21:59+0000\n" "Last-Translator: Kayra Akman \n" "Language-Team: Turkish \n" @@ -55,6 +55,7 @@ msgstr "Bir ay sonra" msgid "After %s days" msgstr "%s gün sonra" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "%s güncellemeleri" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "Ana sunucu" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -113,21 +116,18 @@ msgstr "Seçili dosyayı aktarmada hata" #: ../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." +msgstr "Seçili dosya bir GPG anahtar dosyası olmayabilir veya bozuk olabilir." #: ../SoftwareProperties/SoftwareProperties.py:992 msgid "Error removing the key" msgstr "Anahtar kaldırmada hata" #: ../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." +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:1039 -#, fuzzy +#, fuzzy, python-format msgid "" "Error scanning the CD\n" "\n" @@ -165,6 +165,7 @@ msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor" msgid "A essential package would have to be removed" msgstr "Gerekli bir paketin kaldırılması gerekmekte" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Güncelleme hesaplanamadı" @@ -181,6 +182,7 @@ msgstr "" "Lütfen bu hatayı 'update-manager' için bildirin, hata raporuna /var/log/dist-" "upgrade/ konumundaki dosyaları da ekleyin." +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Bazı paketlerin doğrulamasında hata" @@ -204,9 +206,9 @@ msgstr "'%s' yüklenemiyor" 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. " +msgstr "Gerekli bir paket yüklenemedi. Lütfen bunu bir hata olarak bildirin. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Meta-paket kestirilemedi" @@ -287,6 +289,7 @@ msgstr "" "'Evet'i seçersiniz '%s'den '%s'e kadar olan girdiler güncellenecek.\n" "'Hayır'ı seçerseniz güncelleme iptal edilecek." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Öntanımlı depolar kaydedilsin mi??" @@ -357,6 +360,7 @@ msgstr "" "Çöpünüzü boşaltın ve 'sudo apt-get clean' kullanarak önceden kurulumların " "geçici paketlerini kaldırın." +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Yükseltmeyi başlatmak istiyor musunuz?" @@ -376,8 +380,8 @@ msgstr "" "Yükseltmeden şimdi iptal ediliyor. Sisteminiz kararsız bir durumda olabilir. " "Bir kurtarma işlemi gerçekleştirildi. (dpkg --configure -a).\n" "\n" -"Lütfen 'update-manager' paketi için bu hatayı bildirin. Hata bildirimine " -"/var/log/dist-upgrade/ konumundaki dosyaları da ekleyin." +"Lütfen 'update-manager' paketi için bu hatayı bildirin. Hata bildirimine /" +"var/log/dist-upgrade/ konumundaki dosyaları da ekleyin." #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -428,6 +432,7 @@ msgstr "" "Temizleme sırasında bazı sorunlar oluştu. Bilgi için lütfen aşağıdaki mesaja " "bakın. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "Orijinal sistem durumuna geri dönülüyor" @@ -438,6 +443,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -493,6 +499,7 @@ msgstr "Kullanılmayan yazılımlar aranıyor" msgid "System upgrade is complete." msgstr "Sistem yükseltmesi tamamlandı." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -521,6 +528,7 @@ msgstr "Dosyalar inidiriliyor. İnen: %li Toplam: %li" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "Değişiklikler uygulanıyor" @@ -539,6 +547,7 @@ msgstr "" "bildirin. Hata bildiriminize /var/log/dist-upgrade/ konumundaki dosyaları da " "ekleyin." +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -564,9 +573,9 @@ msgstr "Giderilemez bir hata oluştu" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" "Lütfen bu hatayı bildirin. Hata bildiriminize /var/log/dist-upgrade/ " @@ -575,6 +584,7 @@ msgstr "" "kaydedildi." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -617,8 +627,9 @@ msgid "To prevent data loss close all open applications and documents." msgstr "" "Veri kaybını önlemek için açık olan tüm uygulamaları ve belgeleri kapatın." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "Sisteminiz güncel" @@ -666,6 +677,7 @@ msgid "%li seconds" msgstr "%li saniye" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -687,6 +699,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -706,8 +719,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "Restart the system to complete the upgrade" -msgstr "" -"Yükseltmeyi tamamlamak için sistemi yeniden başlatın" +msgstr "Yükseltmeyi tamamlamak için sistemi yeniden başlatın" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" @@ -784,7 +796,7 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:68 msgid "Could not find the release notes" msgstr "" -"Suggestions: \t\t \n" +"Suggestions: \t\t\r\n" "Yayın notları bulunamadı" #: ../UpdateManager/DistUpgradeFetcher.py:69 @@ -799,6 +811,7 @@ msgstr "Yayın notları indirilemedi" msgid "Please check your internet connection." msgstr "İnternet bağlantınızı kontrol ediniz." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "Yükseltme aracı çalıştırılamadı." @@ -841,8 +854,7 @@ msgstr "Çıkarılamadı" msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " -msgstr "" -"Yükseltme çıkarılamadı. Ağ veya sunucu ile ilgili bir sorun olabilir. " +msgstr "Yükseltme çıkarılamadı. Ağ veya sunucu ile ilgili bir sorun olabilir. " #: ../UpdateManager/DistUpgradeFetcher.py:221 msgid "Verfication failed" @@ -892,14 +904,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "Önemli güvenlik güncelleştirmeleri" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "Önerilen güncellemeler" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "Teklif edilmiş güncellemeler" @@ -912,70 +927,73 @@ msgstr "Backport edilmiş yazılımlar" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "Diğer güncellemeler" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Sürüm %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "Hiç_birini Seçme" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "_Hepsini Seç" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "İndirme boyutu: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s güncelleme kurabilirsiniz" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Lütfen bekleyin, bu işlem biraz zaman alabilir." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Güncelleme tamamlandı" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "Güncellemeler denetleniyor" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "Sürüm %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(Büyüklük:%s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Kullandığınız dağıtım artık desteklenmiyor" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 " @@ -986,16 +1004,17 @@ msgstr "" "Daha fazla bilgi ve yükseltme için http://www.ubuntu.com adresini ziyaret " "edin." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "Yeni dağıtım yayını '%s' ulaşılabilir" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "Yazılım dizini bozulmuş" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 " @@ -1005,19 +1024,23 @@ msgstr "" "durumu düzeltmek için öncelikle \"Synaptic\" paket yöneticisini kullanın ya " "da uçbirim penceresine \"sudo apt-get install -f\" komutunu yazıp çalıştırın." +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 msgid "None" msgstr "Hiçbiri" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1039,8 +1062,8 @@ msgstr "Sisteminizi güncel tutun" #, fuzzy msgid "Not all updates can be installed" msgstr "" -"CD taramada hata \n" -" \n" +"CD taramada hata\r\n" +"\r\n" "%s" #: ../data/glade/UpdateManager.glade.h:6 @@ -1368,185 +1391,229 @@ msgstr "Pencere boyutu" msgid "Configure the sources for installable software and updates" msgstr "Kurulabilir yazılım ve güncellemeler için kaynakları yapılandır" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "Topluluk tarafından bakılan" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "Aygıtlar için kapalı kaynak sürücüler" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "Kısıtlı yazılımlar" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft' Cdrom'u" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "Topluluk tarafından bakılan (universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "Topluluk tarafından bakılan Açık Kaynak Kodlu yazılımlar" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "Özgür olmayan sürücüler" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "Aygıtlar için lisanslı sürücüler " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "Kısıtlı yazılımlar (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake' Cdrom'u" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Geritaşınmış (backported) güncellemeler" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Güncelleştirmeleri" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Geritaşınmış Yazılımlar (Backports)" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Resmi olarak desteklenenler" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Güncelleştirmeleri" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Geritaşınmış Yazılımlar (Backports)" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Topluluk tarafından bakılan (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Özgür olmayan (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "Artık resmi olarak desteklenmiyor" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Sınırlı telif hakkı" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Güvenlik Güncelleştirmeleri" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Güncelleştirmeleri" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Geritaşınmış Yazılımlar (Backports)" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Güvenlik Güncelleştirmeleri" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (test)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (kararsız)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Özgür Olmayan Bağımlılığı Bulunan DFSG Uyumlu Yazılım" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSG Uyumlu Olmayan Yazılım" @@ -1584,4 +1651,4 @@ msgstr "DFSG Uyumlu Olmayan Yazılım" #~ msgstr "Ubuntu 6.06 Güvenlik Güncelleştirmeleri" #~ msgid "Ubuntu 6.06 LTS Security Updates" -#~ msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" \ No newline at end of file +#~ msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" diff --git a/po/uk.po b/po/uk.po index 9b91ef6d..6c21a38d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: uk(5)\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-08-20 22:36+0000\n" "Last-Translator: Vadim Abramchuck \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.2\n" #: ../SoftwareProperties/SoftwareProperties.py:136 @@ -56,6 +56,7 @@ msgstr "Через місяць" msgid "After %s days" msgstr "Через %s днів" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -63,6 +64,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -72,6 +74,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "Помилка видалення ключа" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -162,6 +164,7 @@ msgstr "Не можливо поновити необхідні meta-пакун msgid "A essential package would have to be removed" msgstr "Це призведе до видалення !essential! пакунку системи" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Не можливо розрахувати поновлення" @@ -174,6 +177,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "Помилка підписів в деяких пакунках" @@ -200,6 +204,7 @@ msgid "" msgstr "" "Неможливо встановити необхідний пакунок. Сповістіть про це як про помилку. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" @@ -259,6 +264,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "Створити джерела за замовчуванням?" @@ -318,6 +324,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "Бажаєте почати оновлення системи?" @@ -385,6 +392,7 @@ msgstr "" "При очищенні системи виникли проблеми. Прочитайте детальнішу інформацію " "нижче. " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -395,6 +403,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -445,6 +454,7 @@ msgstr "Пошук програм, що не використовуються" msgid "System upgrade is complete." msgstr "Оновлення системи завершено." +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -472,6 +482,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 #, fuzzy msgid "Applying changes" @@ -488,6 +499,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -511,13 +523,14 @@ msgstr "Виникла невиправна помилка" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -558,11 +571,11 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." -msgstr "" -"Для запобігання втраті інформації закрийте усі програми та документи." +msgstr "Для запобігання втраті інформації закрийте усі програми та документи." +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 #, fuzzy msgid "Your system is up-to-date" msgstr "Ваша система оновлена!" @@ -574,12 +587,12 @@ msgid "" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:535 -#, fuzzy +#, fuzzy, python-format msgid "Remove %s" msgstr "Видалити %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:537 -#, fuzzy +#, fuzzy, python-format msgid "Install %s" msgstr "Встановити %s" @@ -609,6 +622,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -630,6 +644,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -740,6 +755,7 @@ msgstr "Не вдалося завантажити примітки випуск msgid "Please check your internet connection." msgstr "Будь ласка, перевірте ваше з'єднання з Інтернетом." +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 #, fuzzy msgid "Could not run the upgrade tool" @@ -833,14 +849,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -853,33 +872,35 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Версія %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "Розмір завантаження: %s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -887,76 +908,82 @@ msgstr[0] "Ви можете встановити %s оновлення" msgstr[1] "Ви можете встановити %s оновлення" msgstr[2] "Ви можете встановити %s оновлень" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "Будь ласка, зачекайте, це може зайняти деякий час." -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "Оновлення завершено" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "Ваш дистрибутив більше не підтримується" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" "Ви більше не будете отримувати оновлень критичних оновлень та оновлень " -"безпеки. Оновіться до новішої версії Ubuntu Linux. Зайдіть на " -"http://www.ubuntu.com для подальшої інформації про оновлення." +"безпеки. Оновіться до новішої версії Ubuntu Linux. Зайдіть на http://www." +"ubuntu.com для подальшої інформації про оновлення." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1289,190 +1316,233 @@ msgstr "Розмір вікна" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Офіційно підтримуються" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Підтримується спільнотою (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Не-вільний (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Обмежені авторські права" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Оновлення безпеки Debian 3.1 \"Sarge\"" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (тестовий)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (нестабільний)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" -#, python-format #~ msgid "" #~ "Error scaning the CD\n" #~ "\n" @@ -1483,32 +1553,32 @@ msgstr "" #~ "%s" #~ msgid "" -#~ "A unresolvable problem occured while calculating the upgrade. Please report " -#~ "this as a bug. " +#~ "A unresolvable problem occured while calculating the upgrade. Please " +#~ "report this as a bug. " #~ msgstr "" #~ "Під час розрахунку оновлення виникла невиправна помилка. Будь ласка, " #~ "повідомте про це як про помилку програми. " #~ 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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." #~ msgstr "" #~ "Ваша система не містить пакунків ubuntu-desktop, kubuntu-desktop або " #~ "edubuntu-desktop, через що не вдалося встановити, яку версію ubuntu Ви " #~ "використовуєте.\n" -#~ " Будь ласка, спочатку встановіть один з цих пакетів, використовуючи synaptic " -#~ "або apt-get." +#~ " Будь ласка, спочатку встановіть один з цих пакетів, використовуючи " +#~ "synaptic або apt-get." #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "was run (dpkg --configure -a)." +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery was run (dpkg --configure -a)." #~ msgstr "" #~ "Оновлення системи щойно зупинено. Внаслідок цього система може працювати " -#~ "нестабільно. Виконайте команду 'sudo apt-get install -f', або скористайтесь " -#~ "програмою Synaptic для налаштування системи." +#~ "нестабільно. Виконайте команду 'sudo apt-get install -f', або " +#~ "скористайтесь програмою Synaptic для налаштування системи." #~ msgid "Some software no longer officially supported" #~ msgstr "Деяке програмне забезпечення більше офіційно не підтримується" @@ -1517,14 +1587,12 @@ msgstr "" #~ msgid "Restoring originale system state" #~ msgstr "Перезавантаження системи" -#, python-format #~ msgid "About %li minutes remaining" #~ msgstr "Залишилось близько %li хвилин" #~ msgid "Download is complete" #~ msgstr "Завантадення пакунків завершено" -#, python-format #~ msgid "Downloading file %li of %li at %s/s" #~ msgstr "Завантажується файл %li of %li at %s/s" @@ -1532,7 +1600,6 @@ msgstr "" #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#, python-format #~ msgid "" #~ "Replace configuration file\n" #~ "'%s'?" @@ -1542,43 +1609,41 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Please report this as a bug and include the files /var/log/dist-upgrade.log " -#~ "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" +#~ "Please report this as a bug and include the files /var/log/dist-upgrade." +#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts " +#~ "now.\n" #~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." #~ msgstr "" #~ "Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/dist-" #~ "upgrade.log and ~/dist-upgrade-apt.log . Апргрейд щойно перервано." -#, python-format #~ msgid "%s package is going to be removed." #~ msgid_plural "%s packages are going to be removed." #~ msgstr[0] "%s пакунків буде видалено." #~ msgstr[1] "" #~ msgstr[2] "" -#, python-format #~ msgid "%s new package is going to be installed." #~ msgid_plural "%s new packages are going to be installed." #~ msgstr[0] "%s пакунків буде встановлено." #~ msgstr[1] "" #~ msgstr[2] "" -#, python-format #~ msgid "%s package is going to be upgraded." #~ msgid_plural "%s packages are going to be upgraded." #~ msgstr[0] "буде проведено оновлення %s пакунка." #~ msgstr[1] "буде проведено оновлення %s пакунків." #~ msgstr[2] "буде проведено оновлення %s пакунків." -#, python-format #~ msgid "You have to download a total of %s." #~ msgstr "Потрібно завантажити всього %s пакунків." #~ msgid "" -#~ "The upgrade can take several hours and cannot be canceled at any time later." +#~ "The upgrade can take several hours and cannot be canceled at any time " +#~ "later." #~ msgstr "" -#~ "Оновлення може тривати декілька годин; зауважте, що цей процес не може бути " -#~ "перервано протягом усього часу." +#~ "Оновлення може тривати декілька годин; зауважте, що цей процес не може " +#~ "бути перервано протягом усього часу." #~ msgid "Could not find any upgrades" #~ msgstr "Не знайдено пакунків для оновлення" @@ -1626,7 +1691,6 @@ msgstr "" #~ msgid "Show details" #~ msgstr "Показати деталі" -#, python-format #~ msgid "New version: %s (Size: %s)" #~ msgstr "Нова версія: %s (Розмір: %s)" @@ -1661,16 +1725,17 @@ msgstr "" #~ msgstr "Компоненти" #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." #~ msgstr "" -#~ "Введіть повний рядок сховища APT, який ви бажаєте додати\n" +#~ "Введіть повний рядок сховища APT, який ви бажаєте додати\n" #~ "\n" -#~ "Рядок APT містить тип, адресу та вміст сховища, наприклад \"deb " -#~ "http://ftp.debian.org sarge main\". Докладні приклади можна знайти у " +#~ "Рядок APT містить тип, адресу та вміст сховища, наприклад \"deb http://" +#~ "ftp.debian.org sarge main\". Докладні приклади можна знайти у " #~ "документації." #~ msgid "Add Channel" @@ -1701,4 +1766,4 @@ msgstr "" #~ msgstr "Оновлення Ubuntu 6.06 LTS" #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Зворотні порти Ubuntu 6.06 LTS" \ No newline at end of file +#~ msgstr "Зворотні порти Ubuntu 6.06 LTS" diff --git a/po/update-manager.pot b/po/update-manager.pot index 6845de02..1e9dcf1b 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-10-06 23:04+0200\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ur.po b/po/ur.po index d031acf9..4d127f41 100644 --- a/po/ur.po +++ b/po/ur.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -55,6 +55,7 @@ msgstr "ایک ماھ باد" msgid "After %s days" msgstr "بعد %s دن" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -159,6 +161,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -171,6 +174,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -193,6 +197,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -252,6 +257,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -308,6 +314,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -370,6 +377,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -380,6 +388,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -430,6 +439,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -457,6 +467,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -472,6 +483,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -495,13 +507,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -541,8 +554,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -588,6 +602,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -607,6 +622,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -712,6 +728,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -801,14 +818,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -821,106 +841,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1243,187 +1271,232 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #~ msgid " " -#~ msgstr " " \ No newline at end of file +#~ msgstr " " diff --git a/po/urd.po b/po/urd.po index b8c3c023..978beca6 100644 --- a/po/urd.po +++ b/po/urd.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-06 23:04+0200\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" diff --git a/po/vi.po b/po/vi.po index 8fba050d..50355c11 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:45+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" @@ -54,6 +54,7 @@ msgstr "Sau một tháng" msgid "After %s days" msgstr "Sau %s ngày" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -115,16 +118,14 @@ msgstr "Gặp lỗi khi nhập tâp tin đã chọn" #: ../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." +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:992 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +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:1039 @@ -163,6 +164,7 @@ msgstr "Không thể nâng cấp các gói gốc được yêu cầu" msgid "A essential package would have to be removed" msgstr "Một gói quan trọng cần phải bị gỡ bỏ" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "Không thể tính được dung lượng cần nâng cấp" @@ -176,6 +178,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." 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:246 msgid "Error authenticating some packages" msgstr "Gặp lỗi khi đang xác thực một số gói" @@ -202,6 +205,7 @@ msgid "" "bug. " msgstr "Không thể cài đặt được gói yêu cầu. Vui lòng thông báo lỗi này. " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "Không thể đoán được gói gốc" @@ -261,6 +265,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -318,6 +323,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -380,6 +386,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -390,6 +397,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 #, fuzzy @@ -444,6 +452,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -471,6 +480,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 #, fuzzy msgid "Applying changes" @@ -487,6 +497,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -510,13 +521,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -553,8 +565,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 #, fuzzy msgid "Your system is up-to-date" msgstr "Hệ thống bạn toàn mới nhất." @@ -601,6 +614,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -620,6 +634,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -727,6 +742,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -824,15 +840,18 @@ msgstr "" "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động " "chưa." +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -848,109 +867,117 @@ msgstr "Bản cập nhật Ubuntu 5.10" msgid "Distribution updates" msgstr "Đang cài đặt bản cập nhật..." +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "Phiên bản %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "Đang tải các thay đổi" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:830 +#, fuzzy, python-format msgid "Version %s" msgstr "Phiên bản %s:" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 #, 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:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1296,211 +1323,256 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 #, fuzzy msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Bản cập nhật Ubuntu 5.10" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Do cộng đồng bảo quản (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Phần mềm đã đóng góp" +#. Description #: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "Do cộng đồng bảo quản (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Do cộng đồng bảo quản (Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Do cộng đồng bảo quản (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Không tự do (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Không tự do (Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Bản cập nhật Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" +#. Description #: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Được hỗ trợ một cách chính thức" +#. Description #: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Bản cập nhật Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Bản cập nhật Ubuntu 5.10" +#. Description #: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Do cộng đồng bảo quản (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Không tự do (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 #, fuzzy msgid "No longer officially supported" msgstr "Được hỗ trợ một cách chính thức" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Bản quyền bị giới hạn" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Bản cập nhật Ubuntu 4.10" +#. Description #: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 « Sarge »" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Bản cập nhật bảo mặt ổn định Debian" +#. Description #: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Thử ra Debian" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Không Mỹ Debian (Bất định)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1629,12 +1701,12 @@ msgstr "" #~ msgstr "" #~ "Khóa xác thực\n" #~ "\n" -#~ "Bạn có thể thêm và gỡ bỏ khóa xác thực dùng hộp thoại này. Khóa cho phép bạn " -#~ "thẩm tra toàn vẹn của phần mềm đã tải về." +#~ "Bạn có thể thêm và gỡ bỏ khóa xác thực dùng hộp thoại này. Khóa cho phép " +#~ "bạn thẩm tra toàn vẹn của phần mềm đã tải về." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Thêm tập tin khóa mới vào vòng khóa tin cây. Hãy đảm bảo bạn đã nhận khóa " #~ "này qua kênh bảo mật, và bạn tin cây người sở hữu khóa này. " @@ -1664,11 +1736,11 @@ msgstr "" #~ msgstr "Cỡ tối đa, theo MB:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Phục hồi các khóa mặc định có sẵn trong bản phát hành. Tuy nhiên, hành động " -#~ "này sẽ không sửa đổi khóa nào tự cài đặt." +#~ "Phục hồi các khóa mặc định có sẵn trong bản phát hành. Tuy nhiên, hành " +#~ "động này sẽ không sửa đổi khóa nào tự cài đặt." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Đặt cỡ tối _đa cho bộ nhớ tạm gói" @@ -1697,13 +1769,13 @@ msgstr "" #~ msgid "" #~ "Available Updates\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "Bản nâng cấp công bố\n" #~ "\n" -#~ "Tìm thấy có thể nâng cấp những gói theo đây. Để nâng cấp gói, chỉ đơn giản " -#~ "hãy sử dụng nút « Cài đặt »." +#~ "Tìm thấy có thể nâng cấp những gói theo đây. Để nâng cấp gói, chỉ đơn " +#~ "giản hãy sử dụng nút « Cài đặt »." #~ msgid "Cancel downloading the changelog" #~ msgstr "Thôi tải về Bản ghi đổi..." @@ -1759,18 +1831,19 @@ msgstr "" #~ msgstr[0] "Bạn đã chọn tất cả %s gói đã cập nhật: cỡ tổng là %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Bạn đã chọn %s trong %s gói đã cập nhật: cỡ tổng là %s" #~ msgid "The updates are being applied." #~ msgstr "Đang áp dụng những bản cập nhật." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Bạn có thể chạy chỉ một ứng dụng quản lý gói trong một thời gian thôi. Vui " -#~ "lòng đóng ứng dụng khác trước khi tiếp tục." +#~ "Bạn có thể chạy chỉ một ứng dụng quản lý gói trong một thời gian thôi. " +#~ "Vui lòng đóng ứng dụng khác trước khi tiếp tục." #~ msgid "Updating package list..." #~ msgstr "Đạng cập nhật danh sách gói..." @@ -1783,22 +1856,22 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Xin hãy nâng cấp đến một phiên bản Linux Ubuntu mới hơn, vì phiên bản hiện " -#~ "thời của bạn sẽ không còn nhận lại bản cập nhật bảo mật. Hãy xem " +#~ "Xin hãy nâng cấp đến một phiên bản Linux Ubuntu mới hơn, vì phiên bản " +#~ "hiện thời của bạn sẽ không còn nhận lại bản cập nhật bảo mật. Hãy xem " #~ " để tìm thông tin nâng cấp." #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Có một bản phát hành mới có tên mã « %s ». Hãy xem " -#~ " để tìm hướng dẫn nâng cấp." +#~ "Có một bản phát hành mới có tên mã « %s ». Hãy xem để tìm hướng dẫn nâng cấp." #~ msgid "Never show this message again" #~ msgstr "Đừng hiện thông điệp này lần nữa." #~ msgid "Changes not found, the server may not be updated yet." -#~ msgstr "Không tìm thấy thay đổi nào. Có lẽ máy phục vụ chưa được cập nhật." \ No newline at end of file +#~ msgstr "Không tìm thấy thay đổi nào. Có lẽ máy phục vụ chưa được cập nhật." diff --git a/po/xh.po b/po/xh.po index beb100c7..8c711614 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:45+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -55,6 +55,7 @@ msgstr "" msgid "After %s days" msgstr "" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -62,6 +63,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -71,6 +73,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -121,8 +124,7 @@ msgid "Error removing the key" msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -159,6 +161,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "" @@ -171,6 +174,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -193,6 +197,7 @@ msgid "" "bug. " msgstr "" +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -252,6 +257,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -308,6 +314,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "" @@ -370,6 +377,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -380,6 +388,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -430,6 +439,7 @@ msgstr "" msgid "System upgrade is complete." msgstr "" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -457,6 +467,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "" @@ -472,6 +483,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -495,13 +507,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -541,8 +554,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "" @@ -588,6 +602,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -607,6 +622,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -712,6 +728,7 @@ msgstr "" msgid "Please check your internet connection." msgstr "" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "" @@ -803,15 +820,18 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 #, fuzzy msgid "Important security updates" msgstr "Bonisa izihlaziyo" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 #, fuzzy msgid "Proposed updates" @@ -826,108 +846,116 @@ msgstr "" msgid "Distribution updates" msgstr "Bonisa izihlaziyo" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 #, fuzzy msgid "Other updates" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 #, fuzzy msgid "Checking for updates" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1257,184 +1285,229 @@ msgstr "" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -1502,8 +1575,8 @@ msgstr "" #~ msgstr "" #~ "Ulwazi oluhlaziyiweyo\n" #~ "\n" -#~ "Kukho iinkqubo zekhompyutha zasemva kohlaziyo zolwazi olukhoyo. Nceda funda " -#~ "olu lwazi lulandelayo ngocoselelo." +#~ "Kukho iinkqubo zekhompyutha zasemva kohlaziyo zolwazi olukhoyo. Nceda " +#~ "funda olu lwazi lulandelayo ngocoselelo." #~ msgid "Run now" -#~ msgstr "Phumeza inkqubo ngoku" \ No newline at end of file +#~ msgstr "Phumeza inkqubo ngoku" diff --git a/po/zh_CN.po b/po/zh_CN.po index 29018664..26a20108 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-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-10-05 20:36+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_CN \n" @@ -54,6 +54,7 @@ msgstr "一月后" msgid "After %s days" msgstr "%s天后" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -61,6 +62,7 @@ msgstr "%s 更新" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -70,6 +72,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "主服务器" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -119,8 +122,7 @@ msgid "Error removing the key" msgstr "删除密钥时候出错" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你所选择的密钥不能被删除。请汇报这个bug" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -150,7 +152,9 @@ msgstr "破损的软件包" msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." -msgstr "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者apt-get修复它们。" +msgstr "" +"你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者" +"apt-get修复它们。" #: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" @@ -160,6 +164,7 @@ msgstr "不能升级要求的元包" msgid "A essential package would have to be removed" msgstr "一个必要的软件包会被删除" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "无法计算升级" @@ -173,8 +178,10 @@ msgid "" msgstr "" "在计算升级时遇到一个无法解决的问题。\n" "\n" -"请汇报这个有关 'update-manager' 的错误，并且将 /var/log/dist-upgrade/ 中的文件包含在错误报告中。" +"请汇报这个有关 'update-manager' 的错误，并且将 /var/log/dist-upgrade/ 中的文" +"件包含在错误报告中。" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "在认证一些软件包时出错" @@ -184,7 +191,9 @@ 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 "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软件包的列表。" +msgstr "" +"无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软" +"件包的列表。" #: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format @@ -197,6 +206,7 @@ msgid "" "bug. " msgstr "无法安装要求的软件包。请汇报这个bug。 " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "无法猜出元包" @@ -209,8 +219,8 @@ msgid "" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -"你的系统没有一个ubuntu-desktop,kubuntu-desktop或eubuntu-" -"desktop软件包所以无法确定你运行的ubuntu的版本。\n" +"你的系统没有一个ubuntu-desktop,kubuntu-desktop或eubuntu-desktop软件包所以无法" +"确定你运行的ubuntu的版本。\n" " 请先用新立得或apt-get安装以上所举软件包中的一个。" #: ../DistUpgrade/DistUpgradeControler.py:74 @@ -264,10 +274,12 @@ msgid "" "here it will update all '%s' to '%s' entries.\n" "If you select 'no' the update will cancel." msgstr "" -"扫描你的源列表时没有找到用于升级的镜像的条目.可能是因为你运行在一个内部的镜像或镜像信息过时了.\n" +"扫描你的源列表时没有找到用于升级的镜像的条目.可能是因为你运行在一个内部的镜像" +"或镜像信息过时了.\n" "一定要重写您的'sources.list'吗?如果选'Yes'将会更新所有'%s'到'%s'条目.\n" "如果选'no'更新将被取消." +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "生成默认的源?" @@ -303,7 +315,9 @@ 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 "sources.list中的一些第三方源被禁用。你可以在升级后用\"软件属性\"工具或新立得包管理器来重新启用它们." +msgstr "" +"sources.list中的一些第三方源被禁用。你可以在升级后用\"软件属性\"工具或新立得" +"包管理器来重新启用它们." #: ../DistUpgrade/DistUpgradeControler.py:358 msgid "Error during update" @@ -326,8 +340,10 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"升级已被取消。请清理出至少%s的空间在%s磁盘上。清空你的回收站并通过'sudo apt-get clean'命令来删除之前安装的临时软件包。" +"升级已被取消。请清理出至少%s的空间在%s磁盘上。清空你的回收站并通过'sudo apt-" +"get clean'命令来删除之前安装的临时软件包。" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "你要开始升级么？" @@ -344,9 +360,11 @@ msgid "" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -"升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -a)。\n" +"升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -" +"a)。\n" "\n" -"请报告本'update-manger'包的bug，并在报告中包含/var/log/disg-upgrade/中的文件。" +"请报告本'update-manger'包的bug，并在报告中包含/var/log/disg-upgrade/中的文" +"件。" #: ../DistUpgrade/DistUpgradeControler.py:479 msgid "Could not download the upgrades" @@ -397,6 +415,7 @@ msgid "" "more information. " msgstr "在清理时发生问题。更多信息请查看以下消息。 " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "正在恢复原始系统状态" @@ -407,6 +426,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -444,7 +464,8 @@ msgid "" msgstr "" "包信息被更新后核心包'%s'没有找到。\n" "\n" -"这表示严重的错误,请报告这个'update-manager'包的bug，并在报告中包含/var/log/dist-upgrade/中的文件。" +"这表示严重的错误,请报告这个'update-manager'包的bug，并在报告中包含/var/log/" +"dist-upgrade/中的文件。" #: ../DistUpgrade/DistUpgradeControler.py:733 msgid "Asking for confirmation" @@ -462,6 +483,7 @@ msgstr "寻找陈旧的软件包" msgid "System upgrade is complete." msgstr "系统更新完毕" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -489,6 +511,7 @@ msgstr "下载第 %li 个文件(共 %li 个文件)" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "正在应用更新" @@ -502,8 +525,11 @@ msgstr "无法安装'%s'" msgid "" "The upgrade aborts now. Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ in the bugreport." -msgstr "升级中止。请报告本'update-manager'包的bug,度在报告中包含/var/log/dist-upgrade/中的文件。" +msgstr "" +"升级中止。请报告本'update-manager'包的bug,度在报告中包含/var/log/dist-" +"upgrade/中的文件。" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -530,15 +556,17 @@ msgstr "出现致命错误" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -"请报告这个bug并在你的报告中包括文件~/dist-upgrade.log和~/dist-upgrade-apt.log。升级现在取消。\n" +"请报告这个bug并在你的报告中包括文件~/dist-upgrade.log和~/dist-upgrade-apt." +"log。升级现在取消。\n" "你原始的sources.list已保存在/etc/apt/sources.list.distUpgrade." #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -578,8 +606,9 @@ msgstr "下载及升级会持续几个小时，且不可取消。" msgid "To prevent data loss close all open applications and documents." msgstr "关闭所有打开的程序和文档以防止数据丢失。" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "您的系统已为最新" @@ -625,6 +654,7 @@ msgid "%li seconds" msgstr "%li 秒" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -644,6 +674,7 @@ msgstr "升级已经完成并需要重启。你要现在重启么？" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -754,6 +785,7 @@ msgstr "无法下载发行说明" msgid "Please check your internet connection." msgstr "请检查你的互联网连接。" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "不能运行升级工具" @@ -819,12 +851,12 @@ msgid "" msgstr "认证升级信息失败。可能是网络或服务器的问题。 " #: ../UpdateManager/GtkProgress.py:108 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "正在下载文件 %li/%li 速度是 %s/s" #: ../UpdateManager/GtkProgress.py:113 -#, fuzzy +#, fuzzy, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "正在下载文件 %li/%li 速度是 %s/s" @@ -846,14 +878,17 @@ msgid "" "Please check your Internet connection." msgstr "无法下载更新列表。请检查您的网络连接。" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "重要安全更新" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "建议更新" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "建议更新" @@ -867,109 +902,119 @@ msgstr "Backports" msgid "Distribution updates" msgstr "继续升级(_R)" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "其它更新" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 #, fuzzy msgid "Downloading list of changes..." msgstr "正在下载更新列表..." -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "取消全部(_U)" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "选中全部(_C)" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "下载文件大小：%s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "你可以安装 %s 个更新" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "请稍等，这需要花一些时间。" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "检查更新" -#: ../UpdateManager/UpdateManager.py:810 -#, fuzzy +#: ../UpdateManager/UpdateManager.py:826 +#, fuzzy, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "新版本：%s(大小：%s)" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "版本 %s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(大小:%s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "您的发行版不再被支持" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" -"你将不再获得未来的安全修订或重要更新。升级到更高版本的 Ubuntu Linux。请参见 \n" +"你将不再获得未来的安全修订或重要更新。升级到更高版本的 Ubuntu Linux。请参见" +"\r\n" "http://www.ubuntu.com 来获取更多有关升级的信息。" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "新发行版 '%s' 可用" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "软件索引已被破坏" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 "" -"无法安装或删除任何软件。请使用包管理软件\"synaptic\"或在终端运行\"sudo apt-get install -f\"来修正这个问题。" +"无法安装或删除任何软件。请使用包管理软件\"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 "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -985,7 +1030,8 @@ msgid "" msgstr "" "你必须手动检测升级\n" "\n" -"你的系统未自动检测升级。你可以通过编辑\"系统\" -> \"管理\" -> \"软件性能\"改变." +"你的系统未自动检测升级。你可以通过编辑\"系统\" -> \"管理\" -> \"软件性能\"改" +"变." #: ../data/glade/UpdateManager.glade.h:4 msgid "Keep your system up-to-date" @@ -1106,7 +1152,8 @@ msgid "" "The results are used to improve the support for popular applications and to " "rank applications in the search results." msgstr "" -"为了提高Ubuntu的用户体验，请参加流行对比。这样，你安装了哪些软件及使用频度每周会被匿名发送给Unbuntu。\n" +"为了提高Ubuntu的用户体验，请参加流行对比。这样，你安装了哪些软件及使用频度" +"每周会被匿名发送给Unbuntu。\n" "\n" "其结果用于流行软件支持及应用软件搜索排名。" @@ -1231,7 +1278,8 @@ msgid "" "example \"deb http://ftp.debian.org sarge main\"." msgstr "" "输入你想增加的完整的频道 APT 命令行\n" -"APT 命令行包含频道的类型，位置和部分，例如：\"deb http://ftp.debian.org sarge main\"。" +"APT 命令行包含频道的类型，位置和部分，例如：\"deb http://ftp.debian.org " +"sarge main\"。" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" @@ -1285,7 +1333,9 @@ msgid "" "If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." -msgstr "如果自动检查更新被禁用，你将不得不手动重载频道列表。本选项允许隐藏此种情况下要出现的提醒语。" +msgstr "" +"如果自动检查更新被禁用，你将不得不手动重载频道列表。本选项允许隐藏此种情况下" +"要出现的提醒语。" #: ../data/update-manager.schemas.in.h:4 msgid "Remind to reload the channel list" @@ -1314,188 +1364,232 @@ msgstr "窗口大小" msgid "Configure the sources for installable software and updates" msgstr "设定可安装和升级的源" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "社区维护(Universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "设备的专有驱动" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "受限软件" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft' 光盘" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 #, fuzzy msgid "Canonical supported Open Source software" msgstr "社区维护(Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "社区维护(universe)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "社区维护开源软件" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "非自由驱动" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "设备的属性驱动 " +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "受限软件(Multiverse)" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake' 光盘" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "Backported 更新" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger' 光盘" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全更新" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 移植" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'光盘" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "官方支持" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 安全更新" +#. Description #: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Backports" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "社区维护" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'光盘" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "官方不再支持" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版权限制" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 安全更新" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 更新" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 4.10 Backports" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" 安全更新" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (测试)" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (非稳定)" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "带有非自由依赖关系的DFSG兼容软件" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "非DFSG兼容软件" @@ -1503,7 +1597,6 @@ msgstr "非DFSG兼容软件" #~ msgid "By copyright or legal issues restricted software" #~ msgstr "受到版权或法律问题限制的软件" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "正在下载文件 %li/%li 速度未知" @@ -1525,7 +1618,8 @@ msgstr "非DFSG兼容软件" #, fuzzy #~ msgid "" #~ "Upgrading to Ubuntu 6.10" -#~ msgstr "正在升级到 Ubuntu 6.06 LTS" +#~ msgstr "" +#~ "正在升级到 Ubuntu 6.06 LTS" #, fuzzy #~ msgid "Important security updates of Ubuntu" @@ -1553,16 +1647,15 @@ msgstr "非DFSG兼容软件" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "一些更新包要求删除更多的软件。用包管理器 “Synaptic” 的“标出所有更新”功能并运行 “sudo apt-get dist-" -#~ "upgrade”来彻底更你新的系统。" +#~ "一些更新包要求删除更多的软件。用包管理器 “Synaptic” 的“标出所有更新”功能并" +#~ "运行 “sudo apt-get dist-upgrade”来彻底更你新的系统。" #~ msgid "The following updates will be skipped:" #~ msgstr "将跳过以下的升级包" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "大约还要%li秒" @@ -1635,8 +1728,8 @@ msgstr "非DFSG兼容软件" #~ msgstr "Ubuntu 6.06 LTS 后备支持" #~ msgid "" -#~ "While scaning your repository information no valid entry for the upgrade was " -#~ "found.\n" +#~ "While scaning your repository information no valid entry for the upgrade " +#~ "was found.\n" #~ msgstr "在检查你的源的信息时未能找到有效的升级记录\n" #~ msgid "Repositories changed" @@ -1748,4 +1841,4 @@ msgstr "非DFSG兼容软件" #~ msgstr "CD" #~ msgid "Non-free software" -#~ msgstr "非自由软件" \ No newline at end of file +#~ msgstr "非自由软件" diff --git a/po/zh_HK.po b/po/zh_HK.po index cbf7101e..50e902bc 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-06-16 01:18+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (Hong Kong) \n" @@ -53,6 +53,7 @@ msgstr "一個月後" msgid "After %s days" msgstr "%s 日後" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -60,6 +61,7 @@ msgstr "" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 #, python-format msgid "%s (%s)" @@ -69,6 +71,7 @@ msgstr "" msgid "Main server" msgstr "" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -118,8 +121,7 @@ msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -146,7 +148,9 @@ msgstr "不完整套件" msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." -msgstr "系統裝了不完整的套件，本程式無法將它們修復。請先用 synaptic 或 apt-get 來修復套件。" +msgstr "" +"系統裝了不完整的套件，本程式無法將它們修復。請先用 synaptic 或 apt-get 來修復" +"套件。" #: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" @@ -156,6 +160,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "無法計算升級過程" @@ -168,6 +173,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "" @@ -177,7 +183,9 @@ 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 "有些套件不能認證，這可能是短暫的網絡問題；你可以稍後再試。以下為沒有認證的套件。" +msgstr "" +"有些套件不能認證，這可能是短暫的網絡問題；你可以稍後再試。以下為沒有認證的套" +"件。" #: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format @@ -190,6 +198,7 @@ msgid "" "bug. " msgstr "有必須的套件無法安裝，請匯報問題。 " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "" @@ -249,6 +258,7 @@ msgid "" "If you select 'no' the update will cancel." msgstr "" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "" @@ -305,6 +315,7 @@ msgid "" "apt-get clean'." msgstr "" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "是否要開始升級？" @@ -367,6 +378,7 @@ msgid "" "more information. " msgstr "" +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "" @@ -377,6 +389,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -427,6 +440,7 @@ msgstr "正在搜尋過時的軟件" msgid "System upgrade is complete." msgstr "已完成系統升級。" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -454,6 +468,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 #, fuzzy msgid "Applying changes" @@ -470,6 +485,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -493,13 +509,14 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -536,8 +553,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "系統已經在最新狀態" @@ -583,6 +601,7 @@ msgid "%li seconds" msgstr "" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -602,6 +621,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -707,6 +727,7 @@ msgstr "無法下載發行通告" msgid "Please check your internet connection." msgstr "請檢查網絡連線是否正常。" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "無法執行升級工具" @@ -796,14 +817,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -816,106 +840,114 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "版本 %s: \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "下載大小：%s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "你可以安裝 %s 個更新套件" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "完成更新" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "已經不再支援你用的發行版本" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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" @@ -1242,190 +1274,233 @@ msgstr "視窗大小" msgid "Configure the sources for installable software and updates" msgstr "" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "正式支援" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "協力維護軟件 (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由軟件 (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版權受限" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1「Sarge」" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1「Sarge」安全性更新" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian 「Etch」（測試版）" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "ftp://ftp.hk.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian 「Sid」（不穩定版）" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "符合 DFSG 的軟件，但依賴於非自由軟件" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "和 DFSG 不相容的軟件" -#, python-format #~ msgid "" #~ "Error scaning the CD\n" #~ "\n" @@ -1436,19 +1511,19 @@ msgstr "和 DFSG 不相容的軟件" #~ "%s" #~ msgid "" -#~ "A unresolvable problem occured while calculating the upgrade. Please report " -#~ "this as a bug. " +#~ "A unresolvable problem occured while calculating the upgrade. Please " +#~ "report this as a bug. " #~ msgstr "計算升級時發生無法解決的問題，請匯報問題。 " #~ 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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." #~ msgstr "" -#~ "系統沒有安裝 ubuntu-desktop、kubuntu-desktop 或 edubuntu-desktop 套件，因此無法偵測正在執行哪一個版本的 " -#~ "ubuntu。\n" +#~ "系統沒有安裝 ubuntu-desktop、kubuntu-desktop 或 edubuntu-desktop 套件，因" +#~ "此無法偵測正在執行哪一個版本的 ubuntu。\n" #~ "請先使用 synaptic 或 apt-get 安裝上述其中一個套件。" #~ msgid "" @@ -1456,13 +1531,15 @@ msgstr "和 DFSG 不相容的軟件" #~ "enable them after the upgrade with the 'software-properties' tool or with " #~ "synaptic." #~ msgstr "" -#~ "sources.list 中部份外來的套件來源已經被停用。系統升級後，你可以使用「software-properties」工具或 synaptic " -#~ "重新啟用這些來源。" +#~ "sources.list 中部份外來的套件來源已經被停用。系統升級後，你可以使用" +#~ "「software-properties」工具或 synaptic 重新啟用這些來源。" #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "was run (dpkg --configure -a)." -#~ msgstr "升級中止。你的系統現在可能在一個不穩定的狀態。正在進行復原 (dpkg --configure -a)。" +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery was run (dpkg --configure -a)." +#~ msgstr "" +#~ "升級中止。你的系統現在可能在一個不穩定的狀態。正在進行復原 (dpkg --" +#~ "configure -a)。" #~ msgid "Some software no longer officially supported" #~ msgstr "某些軟件不會再有正式支援" @@ -1470,33 +1547,27 @@ msgstr "和 DFSG 不相容的軟件" #~ msgid "Restoring originale system state" #~ msgstr "恢復原來的系統狀態" -#, python-format #~ msgid "About %li days %li hours %li minutes remaining" #~ msgstr "大約還剩下 %li 天 %li 小時 %li 分鐘" -#, python-format #~ msgid "About %li hours %li minutes remaining" #~ msgstr "大約還剩下 %li 小時 %li 分鐘" -#, python-format #~ msgid "About %li minutes remaining" #~ msgstr "大約還剩下 %li 分鐘" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "大約還剩下 %li 秒鐘" #~ msgid "Download is complete" #~ msgstr "下載完成" -#, python-format #~ msgid "Downloading file %li of %li" #~ msgstr "正在下載檔案 %li/%li" #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "升級現正中止，請匯報問題。" -#, python-format #~ msgid "" #~ "Replace configuration file\n" #~ "'%s'?" @@ -1504,17 +1575,14 @@ msgstr "和 DFSG 不相容的軟件" #~ "取代設定檔\n" #~ "「%s」？" -#, python-format #~ msgid "%s package is going to be removed." #~ msgid_plural "%s packages are going to be removed." #~ msgstr[0] "準備移除 %s 個套件。" -#, python-format #~ msgid "%s new package is going to be installed." #~ msgid_plural "%s new packages are going to be installed." #~ msgstr[0] "準備安裝 %s 個新套件。" -#, python-format #~ msgid "%s package is going to be upgraded." #~ msgid_plural "%s packages are going to be upgraded." #~ msgstr[0] "準備升級 %s 個套件。" @@ -1526,15 +1594,13 @@ msgstr "和 DFSG 不相容的軟件" #~ msgstr "正在升級 Ubuntu" #~ msgid "" -#~ "Verfing the upgrade failed. There may be a problem with the network or with " -#~ "the server. " +#~ "Verfing the upgrade failed. There may be a problem with the network or " +#~ "with the server. " #~ msgstr "檢驗升級套件失敗。可能是因為網路或伺服器出現問題。 " -#, python-format #~ msgid "Downloading file %li of %li with %s/s" #~ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "正在下載檔案 %li/%li，下載速度不明" @@ -1551,11 +1617,12 @@ msgstr "和 DFSG 不相容的軟件" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "有一些更新套件需要移除其它套件才可以安裝。請使用「Synaptic 套件管理程式」的「標記所有升級」功能或在終端機中執行「sudo apt-get " -#~ "dist-upgrade」來更新整個系統。" +#~ "有一些更新套件需要移除其它套件才可以安裝。請使用「Synaptic 套件管理程式」" +#~ "的「標記所有升級」功能或在終端機中執行「sudo apt-get dist-upgrade」來更新" +#~ "整個系統。" #~ msgid "The following updates will be skipped:" #~ msgstr "會略過更新以下套件：" @@ -1598,16 +1665,16 @@ msgstr "和 DFSG 不相容的軟件" #, fuzzy #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." #~ msgstr "" #~ "請輸入整行你想加入的 APT 軟件庫位置\n" #~ "\n" -#~ "該行的內容包括 APT 軟件庫的類型、位置和內容，例如： \"deb http://ftp.debian.org sarge " -#~ "main\"。你可以在文件中尋找有關該行的格式的詳細描述。" +#~ "該行的內容包括 APT 軟件庫的類型、位置和內容，例如： \"deb http://ftp." +#~ "debian.org sarge main\"。你可以在文件中尋找有關該行的格式的詳細描述。" #~ msgid "Edit Channel" #~ msgstr "修改套件來源" @@ -1636,4 +1703,4 @@ msgstr "和 DFSG 不相容的軟件" #, fuzzy #~ msgid "Ubuntu 6.06 LTS Backports" -#~ msgstr "Ubuntu 5.10 更新" \ No newline at end of file +#~ msgstr "Ubuntu 5.10 更新" diff --git a/po/zh_TW.po b/po/zh_TW.po index b1e583d0..203074cd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2,7 +2,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-10-04 20:51+0000\n" +"POT-Creation-Date: 2006-10-06 23:18+0200\n" "PO-Revision-Date: 2006-09-14 07:29+0000\n" "Last-Translator: SOC Ho \n" "Language-Team: Chinese (Taiwan) \n" @@ -49,6 +49,7 @@ msgstr "一個月後" msgid "After %s days" msgstr "%s 天過後" +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu #: ../SoftwareProperties/SoftwareProperties.py:252 #, python-format msgid "%s updates" @@ -56,8 +57,9 @@ msgstr "%s 更新" #. TRANSLATORS: Label for the components in the Internet section #. first %s is the description of the component +#. second %s is the code name of the comp, eg main, universe #: ../SoftwareProperties/SoftwareProperties.py:264 -#, fuzzy +#, fuzzy, python-format msgid "%s (%s)" msgstr "%s (%s)" @@ -65,6 +67,7 @@ msgstr "%s (%s)" msgid "Main server" msgstr "主要伺服器" +#. TRANSLATORS: %s is a country #: ../SoftwareProperties/SoftwareProperties.py:320 #: ../SoftwareProperties/SoftwareProperties.py:338 #, python-format @@ -114,8 +117,7 @@ msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" #: ../SoftwareProperties/SoftwareProperties.py:993 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" #: ../SoftwareProperties/SoftwareProperties.py:1039 @@ -142,7 +144,9 @@ msgstr "不完整套件" msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." -msgstr "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 synaptic 或 apt-get 來修恢它們。" +msgstr "" +"您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 " +"synaptic 或 apt-get 來修恢它們。" #: ../DistUpgrade/DistUpgradeCache.py:207 msgid "Can't upgrade required meta-packages" @@ -152,6 +156,7 @@ msgstr "無法升級須要的元套件 (meta-package)" msgid "A essential package would have to be removed" msgstr "將會移除的核心套件" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:220 msgid "Could not calculate the upgrade" msgstr "無法計算升級" @@ -164,6 +169,7 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:246 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" @@ -173,7 +179,9 @@ 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 "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證的套件。" +msgstr "" +"一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證" +"的套件。" #: ../DistUpgrade/DistUpgradeCache.py:312 #, python-format @@ -186,6 +194,7 @@ msgid "" "bug. " msgstr "無法安裝須要的套件，請匯報問題。 " +#. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:320 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" @@ -212,7 +221,8 @@ msgid "" "The error message was:\n" "'%s'" msgstr "" -"在加入光碟時有錯誤產升，升級將終止。若此光碟為一個有效的ubuntu光碟，請將此舉報為臭蟲。\n" +"在加入光碟時有錯誤產升，升級將終止。若此光碟為一個有效的ubuntu光碟，請將此舉" +"報為臭蟲。\n" "\n" "錯誤訊息為：\n" "「%s」" @@ -248,11 +258,14 @@ msgid "" "here it will update all '%s' to '%s' entries.\n" "If you select 'no' the update will cancel." msgstr "" -"掃描你的套件庫資訊時，找不到任何 mirror。這可能在你使用內部 mirror 或 mirror 資訊已經過時的時候發生。\n" +"掃描你的套件庫資訊時，找不到任何 mirror。這可能在你使用內部 mirror 或 mirror " +"資訊已經過時的時候發生。\n" "\n" -"是否無論如何都要重新寫入 'sources.list'？ 如果選擇「是」，將會更新所有 '%s' 到 '%s'。\n" +"是否無論如何都要重新寫入 'sources.list'？ 如果選擇「是」，將會更新所有 '%s' " +"到 '%s'。\n" "如果選擇「否」，則更新會被取消。" +#. hm, still nothing useful ... #: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Generate default sources?" msgstr "產生預設的來源？" @@ -311,8 +324,10 @@ msgid "" "your trash and remove temporary packages of former installations using 'sudo " "apt-get clean'." msgstr "" -"升級中止。請至少空出 %s 的磁碟空間 (從%s上)。 清空垃圾桶及使用 'sudo apt-get clean'來移除先前安裝套件時的暫存檔。" +"升級中止。請至少空出 %s 的磁碟空間 (從%s上)。 清空垃圾桶及使用 'sudo apt-get " +"clean'來移除先前安裝套件時的暫存檔。" +#. ask the user if he wants to do the changes #: ../DistUpgrade/DistUpgradeControler.py:440 msgid "Do you want to start the upgrade?" msgstr "是否要開始升級？" @@ -375,6 +390,7 @@ msgid "" "more information. " msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 " +#. generate a new cache #: ../DistUpgrade/DistUpgradeControler.py:576 msgid "Restoring original system state" msgstr "回覆原有系統狀態" @@ -385,6 +401,7 @@ msgid "Fetching backport of '%s'" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) #: ../DistUpgrade/DistUpgradeControler.py:667 #: ../DistUpgrade/DistUpgradeControler.py:709 msgid "Checking package manager" @@ -435,6 +452,7 @@ msgstr "尋搜不再使用的套件" msgid "System upgrade is complete." msgstr "系統升級完成。" +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Please insert '%s' into the drive '%s'" @@ -462,6 +480,7 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:163 msgid "Applying changes" msgstr "正在套用變更" @@ -477,6 +496,7 @@ msgid "" "package and include the files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +#. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" @@ -500,13 +520,14 @@ msgstr "發生嚴重錯誤" #: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" -"Please report this as a bug and include the files /var/log/dist-" -"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The " -"upgrade aborts now.\n" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " +"now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" #. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext #: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format msgid "%d package is going to be removed." @@ -546,8 +567,9 @@ msgstr "" msgid "To prevent data loss close all open applications and documents." msgstr "避免遺失請關閉所有已開啟的程式及文件。" +#. FIXME: this should go into DistUpgradeController #: ../DistUpgrade/DistUpgradeViewGtk.py:518 -#: ../UpdateManager/UpdateManager.py:606 +#: ../UpdateManager/UpdateManager.py:622 msgid "Your system is up-to-date" msgstr "系統已經在最新狀態" @@ -593,6 +615,7 @@ msgid "%li seconds" msgstr "%li秒" #. 56 kbit +#. 1Mbit = 1024 kbit #: ../DistUpgrade/DistUpgradeView.py:38 #, python-format msgid "" @@ -612,6 +635,7 @@ msgstr "升級已經完成及須要重新啟動。現在要重新啟動嗎？" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/glade/SoftwareProperties.glade.h:1 msgid " " @@ -720,6 +744,7 @@ msgstr "無法下載發行說明" msgid "Please check your internet connection." msgstr "請檢查您的網路連線。" +#. no script file found in extracted tarbal #: ../UpdateManager/DistUpgradeFetcher.py:149 msgid "Could not run the upgrade tool" msgstr "無法執行升級工具" @@ -809,14 +834,17 @@ msgid "" "Please check your Internet connection." msgstr "" +#. Description #: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88 msgid "Important security updates" msgstr "重要的安全更新" +#. Description #: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93 msgid "Recommended updates" msgstr "建議的安全更新" +#. Description #: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98 msgid "Proposed updates" msgstr "" @@ -829,108 +857,118 @@ msgstr "" msgid "Distribution updates" msgstr "" +#. TRANSLATORS: updates from an 'unknown' origin #: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266 msgid "Other updates" msgstr "其他更新" -#: ../UpdateManager/UpdateManager.py:462 +#: ../UpdateManager/UpdateManager.py:478 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:523 +#: ../UpdateManager/UpdateManager.py:539 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:550 +#: ../UpdateManager/UpdateManager.py:566 msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:556 +#: ../UpdateManager/UpdateManager.py:572 msgid "_Check All" msgstr "" -#: ../UpdateManager/UpdateManager.py:597 ../UpdateManager/UpdateManager.py:621 +#. TRANSLATORS: b stands for Bytes +#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637 #, python-format msgid "Download size: %s" msgstr "下載大小：%s" -#: ../UpdateManager/UpdateManager.py:617 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "您可以安裝 %s 個更新" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:666 msgid "Please wait, this can take some time." msgstr "請稍候，這可能需要一點時間。" -#: ../UpdateManager/UpdateManager.py:652 +#: ../UpdateManager/UpdateManager.py:668 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:703 +#: ../UpdateManager/UpdateManager.py:719 msgid "Checking for updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:810 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:814 +#: ../UpdateManager/UpdateManager.py:830 #, python-format msgid "Version %s" msgstr "版本%s" -#: ../UpdateManager/UpdateManager.py:816 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:832 #, python-format msgid "(Size: %s)" msgstr "(大小： %s)" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:843 msgid "Your distribution is not supported anymore" msgstr "您正使用的發行版本已不再支援" -#: ../UpdateManager/UpdateManager.py:828 +#: ../UpdateManager/UpdateManager.py:844 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 "" -"您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 http://www.ubuntu.com以取得更多升級資訊。" +"您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 " +"http://www.ubuntu.com以取得更多升級資訊。" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:863 #, python-format msgid "New distribution release '%s' is available" msgstr "有新的 distribution 發行版 '%s'" -#: ../UpdateManager/UpdateManager.py:882 +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:898 msgid "Software index is broken" msgstr "軟體索引損壞" -#: ../UpdateManager/UpdateManager.py:883 +#: ../UpdateManager/UpdateManager.py:899 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 "" -"不能安裝或移除任何套件。請先使用套件管理程式“Synaptic”或在終端機中執行“sudo apt-get install -f”來修正問題。" +"不能安裝或移除任何套件。請先使用套件管理程式“Synaptic”或在終端機中執行“sudo " +"apt-get install -f”來修正問題。" +#. TRANSLATORS: download size is 0 #: ../UpdateManager/Common/utils.py:33 #, fuzzy msgid "None" msgstr "無下載" +#. TRANSLATORS: download size of very small updates #: ../UpdateManager/Common/utils.py:36 msgid "1 KB" msgstr "1 KB" +#. TRANSLATORS: download size of small updates, e.g. "250 KB" #: ../UpdateManager/Common/utils.py:39 #, python-format msgid "%.0f KB" msgstr "%.0f KB" +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" #: ../UpdateManager/Common/utils.py:42 #, python-format msgid "%.1f MB" @@ -1254,185 +1292,229 @@ msgstr "視窗大小" msgid "Configure the sources for installable software and updates" msgstr "設置可安裝的軟體及更新部份之來源。" +#. ChangelogURI #: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Ubuntu.info.in:8 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 6.10 'Edgy Eft'的光碟" +#. Description #: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:62 msgid "Canonical supported Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" +#. CompDescriptionLong #: ../data/channels/Ubuntu.info.in:71 msgid "Software restricted by copyright or legal issues" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "含Ubuntu 6.06 LTS 'Dapper Drake'之光碟" +#. Description #: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'的光碟" +#. Description #: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10安全性更新" +#. Description #: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10更新" +#. Description #: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +#. Description #: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟" +#. CompDescription #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "官方支援" +#. Description #: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04安全性更新" +#. Description #: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04更新" +#. Description #: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description #: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 'Warty Warthog'" +#. CompDescription #: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "協力維護軟體 (Universe)" +#. CompDescription #: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由軟體 (Multiverse)" +#. Description #: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟" +#. CompDescription #: ../data/channels/Ubuntu.info.in:209 msgid "No longer officially supported" msgstr "" +#. CompDescription #: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版權受限制" +#. Description #: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10安全性更新" +#. Description #: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10更新" +#. Description #: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" +#. ChangelogURI #: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 “Sarge”" +#. BaseURI #: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 “Sarge” 安全性更新" +#. Description #: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian “Etch”（測試版）" +#. BaseURI #: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian “Sid”（不穩定版）" +#. CompDescription #: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體" +#. CompDescription #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "不符合 DFSG 的軟體" @@ -1440,17 +1522,14 @@ msgstr "不符合 DFSG 的軟體" #~ msgid " " #~ msgstr " " -#, python-format #~ msgid "%s new package is going to be installed." #~ msgid_plural "%s new packages are going to be installed." #~ msgstr[0] "%s 個新套件將會安裝。" -#, python-format #~ msgid "%s package is going to be removed." #~ msgid_plural "%s packages are going to be removed." #~ msgstr[0] "%s 個套件將會移除。" -#, python-format #~ msgid "%s package is going to be upgraded." #~ msgid_plural "%s packages are going to be upgraded." #~ msgstr[0] "%s 個套件將會升級。" @@ -1458,26 +1537,29 @@ msgstr "不符合 DFSG 的軟體" #~ msgid "" #~ "The channel information is out-of-date\n" #~ "\n" -#~ "You have to reload the channel information to install software and updates " -#~ "from newly added or changed channels. \n" +#~ "You have to reload the channel information to install software and " +#~ "updates from newly added or changed channels. \n" #~ "\n" #~ "You need a working internet connection to continue." #~ msgstr "" #~ "套件來源的資料已經過期\n" #~ "\n" -#~ "您需要重新載入套件來源的資料以安裝軟體，及更新套件來源新加入或修改了的套件。\n" +#~ "您需要重新載入套件來源的資料以安裝軟體，及更新套件來源新加入或修改了的套" +#~ "件。\n" #~ "\n" #~ "您須要連線到網際網路繼續。" #~ msgid "" #~ "You must check for updates manually\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" #~ "您必須自行檢查更新\n" #~ "\n" -#~ "您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設定。" +#~ "您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設" +#~ "定。" #~ msgid "Channel" #~ msgstr "套件來源" @@ -1492,8 +1574,8 @@ msgstr "不符合 DFSG 的軟體" #~ msgstr "金鑰" #~ msgid "" -#~ "Enter the complete APT line of the channel that you want to " -#~ "add\n" +#~ "Enter the complete APT line of the channel that you want to add\n" #~ "\n" #~ "The APT line includes the type, location and components of a channel, for " #~ "example \"deb http://ftp.debian.org sarge main\"." @@ -1501,10 +1583,9 @@ msgstr "不符合 DFSG 的軟體" #~ "請輸入您想加入的完整的 APT 來源列\n" #~ "\n" #~ "\n" -#~ "APT 來源列包括了來源的類型、位置及 components，例如 \"deb http://ftp.debian.org sarge " -#~ "main\"。" +#~ "APT 來源列包括了來源的類型、位置及 components，例如 \"deb http://ftp." +#~ "debian.org sarge main\"。" -#, python-format #~ msgid "" #~ "Error scaning the CD\n" #~ "\n" @@ -1526,26 +1607,23 @@ msgstr "不符合 DFSG 的軟體" #~ msgid "" #~ "Upgrading to Ubuntu 6.06 LTS" -#~ msgstr "升級至 Ubuntu 6.06 LTS" +#~ msgstr "" +#~ "升級至 Ubuntu 6.06 LTS" #~ msgid "" -#~ "A unresolvable problem occured while calculating the upgrade. Please report " -#~ "this as a bug. " +#~ "A unresolvable problem occured while calculating the upgrade. Please " +#~ "report this as a bug. " #~ msgstr "計算升級時發生無法解決的問題，請匯報問題。 " -#, python-format #~ msgid "About %li days %li hours %li minutes remaining" #~ msgstr "大約還剩下 %li 天 %li 小時 %li 分鐘" -#, python-format #~ msgid "About %li hours %li minutes remaining" #~ msgstr "大約還剩下 %li 小時 %li 分鐘" -#, python-format #~ msgid "About %li minutes remaining" #~ msgstr "大約還剩下 %li 分鐘" -#, python-format #~ msgid "About %li seconds remaining" #~ msgstr "大約還剩下 %li 秒鐘" @@ -1555,7 +1633,6 @@ msgstr "不符合 DFSG 的軟體" #~ msgid "Add _Cdrom" #~ msgstr "加入光碟(_C)" -#, python-format #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore.\n" @@ -1582,19 +1659,15 @@ msgstr "不符合 DFSG 的軟體" #~ msgid "Downloading and installing the upgrades" #~ msgstr "正在下載及安裝升級" -#, python-format #~ msgid "Downloading file %li of %li" #~ msgstr "正在下載檔案 %li/%li" -#, python-format #~ msgid "Downloading file %li of %li at %s/s" #~ msgstr "正在下載檔案 %li/%li，速度在 %s/秒" -#, python-format #~ msgid "Downloading file %li of %li with %s/s" #~ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" -#, python-format #~ msgid "Downloading file %li of %li with unknown speed" #~ msgstr "正在下載檔案 %li/%li，下載速度不明" @@ -1614,14 +1687,15 @@ msgstr "不符合 DFSG 的軟體" #~ msgid "" #~ "If automatic checking for updates is disabeld, you have to reload the " -#~ "channel list manually. This option allows to hide the reminder shown in this " -#~ "case." -#~ msgstr "如果停用自動更新檢查，您需要自行重新載入套件來源清單。在此情況下本選項允許關閉更新提示" +#~ "channel list manually. This option allows to hide the reminder shown in " +#~ "this case." +#~ msgstr "" +#~ "如果停用自動更新檢查，您需要自行重新載入套件來源清單。在此情況下本選項允許" +#~ "關閉更新提示" #~ msgid "Installation Media" #~ msgstr "安裝媒體" -#, python-format #~ msgid "New version: %s (Size: %s)" #~ msgstr "新版本：%s （大小：%s）" @@ -1633,15 +1707,15 @@ msgstr "不符合 DFSG 的軟體" #~ msgstr "請先關閉其它程式，如‘aptitude’ 或‘Synaptic’。" #~ msgid "" -#~ "Please report this as a bug and include the files /var/log/dist-upgrade.log " -#~ "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" +#~ "Please report this as a bug and include the files /var/log/dist-upgrade." +#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts " +#~ "now.\n" #~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." #~ msgstr "" -#~ "請將此視為 bug 來回報，並於報告中包含 /var/log/dist-upgrade.log 及 /var/log/dist-upgrade-" -#~ "apt.log 這兩個檔案。 現在取消更新。\n" +#~ "請將此視為 bug 來回報，並於報告中包含 /var/log/dist-upgrade.log 及 /var/" +#~ "log/dist-upgrade-apt.log 這兩個檔案。 現在取消更新。\n" #~ "您的原始 sources.list 已被存到 /etc/apt/sources.list.distUpgrade。" -#, python-format #~ msgid "" #~ "Replace configuration file\n" #~ "'%s'?" @@ -1669,16 +1743,16 @@ msgstr "不符合 DFSG 的軟體" #~ "enable them after the upgrade with the 'software-properties' tool or with " #~ "synaptic." #~ msgstr "" -#~ "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-properties' 工具或 " -#~ "synaptic升級後，你可以重新啟用它。" +#~ "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-" +#~ "properties' 工具或 synaptic升級後，你可以重新啟用它。" #~ msgid "" #~ "Some updates require the removal of further software. Use the function " -#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" -#~ "get dist-upgrade\" in a terminal to update your system completely." +#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " +#~ "apt-get dist-upgrade\" in a terminal to update your system completely." #~ msgstr "" -#~ "有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」功能或在終端機中執行“sudo apt-get dist-" -#~ "upgrade”來完整地更新您的系統。" +#~ "有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」" +#~ "功能或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。" #~ msgid "" #~ "Stores the state of the expander that contains the list of changs and the " @@ -1695,12 +1769,15 @@ msgstr "不符合 DFSG 的軟體" #~ msgstr "升級現正中止，請匯報問題。" #~ msgid "" -#~ "The upgrade aborts now. Your system can be in an unusable state. A recovery " -#~ "was run (dpkg --configure -a)." -#~ msgstr "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --configure -a)。" +#~ "The upgrade aborts now. Your system can be in an unusable state. A " +#~ "recovery was run (dpkg --configure -a)." +#~ msgstr "" +#~ "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --" +#~ "configure -a)。" #~ msgid "" -#~ "The upgrade can take several hours and cannot be canceled at any time later." +#~ "The upgrade can take several hours and cannot be canceled at any time " +#~ "later." #~ msgstr "升級可能需要數小時及無法在稍後任何時間取消。" #~ msgid "" @@ -1730,23 +1807,22 @@ msgstr "不符合 DFSG 的軟體" #~ msgstr "正在升級 Ubuntu" #~ msgid "" -#~ "Verfing the upgrade failed. There may be a problem with the network or with " -#~ "the server. " +#~ "Verfing the upgrade failed. There may be a problem with the network or " +#~ "with the server. " #~ msgstr "檢驗升級套件失敗。可能是因為跟伺服器的網路連接出現問題。 " -#, python-format #~ msgid "You have to download a total of %s." #~ msgstr "您總共需要下載 %s。" #~ 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 " -#~ "you are runing.\n" +#~ "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 you are runing.\n" #~ " Please install one of the packages above first using synaptic or apt-get " #~ "before proceeding." #~ msgstr "" -#~ "您的系統沒有安裝 ubuntu-desktop，kubuntu-desktop 或 edubuntu-desktop " -#~ "套件，因此無法偵測正在執行那個版本的 ubuntu。\n" +#~ "您的系統沒有安裝 ubuntu-desktop，kubuntu-desktop 或 edubuntu-desktop 套" +#~ "件，因此無法偵測正在執行那個版本的 ubuntu。\n" #~ " 請進行操作前使用 synaptic 或 apt-get安裝上述其中一個套件" #~ msgid "Your system has already been upgraded." @@ -1756,4 +1832,4 @@ msgstr "不符合 DFSG 的軟體" #~ msgstr "自訂(_C)" #~ msgid "_Download updates in the background, but do not install them" -#~ msgstr "在背景下載更新套件，但無須安裝(_D)" \ No newline at end of file +#~ msgstr "在背景下載更新套件，但無須安裝(_D)" -- cgit v1.2.3 From ba0fc9a5fc32bc7f43aa6043a7f05a5145e432f8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Oct 2006 18:57:13 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - run the postUpgradeRules() after the upgrade and before trying to install any missing meta-packages --- DistUpgrade/DistUpgradeCache.py | 8 ++++---- debian/changelog | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 7d0d27e0..2e21d05d 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -202,16 +202,16 @@ class MyCache(apt.Cache): # upgrade (and make sure this way that the cache is ok) self.upgrade(True) - # then see if meta-pkgs are missing - 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() + # then see if meta-pkgs are missing + if not self._installMetaPkgs(view): + raise SystemError, _("Can't upgrade required meta-packages") + # see if it all makes sense if not self._verifyChanges(): raise SystemError, _("A essential package would have to be removed") diff --git a/debian/changelog b/debian/changelog index 721ed39b..4f9c7dd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ update-manager (0.44.17) edgy; urgency=low * memory leak fixed (lp: #43096) - -- + -- Michael Vogt Mon, 9 Oct 2006 15:24:40 +0200 update-manager (0.44.16) edgy; urgency=low -- cgit v1.2.3 From 3b322f37caa66b7fce40061e70273eb75248ffed Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 11 Oct 2006 18:56:43 +0200 Subject: * debian/control: - add python-gconf dependency / remove python-gnome2 dependency * DistUpgrade/DistUpgradeViewGtk.py: - run while gtk_events_pending()/gtk_main_iteration() after information() --- DistUpgrade/DistUpgradeViewGtk.py | 2 ++ debian/changelog | 8 ++++++++ debian/control | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 11b3e041..3dcfb7ed 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -458,6 +458,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): self.dialog_information.window.set_functions(gtk.gdk.FUNC_MOVE) self.dialog_information.run() self.dialog_information.hide() + while gtk.events_pending(): + gtk.main_iteration() def error(self, summary, msg, extended_msg=None): self.dialog_error.set_transient_for(self.window_main) diff --git a/debian/changelog b/debian/changelog index 4f9c7dd0..fc133de0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +update-manager (0.45) edgy; urgency=low + + * debian/control: + - added dependency on python-gconf + - removed recommends on python-gnome2 + + -- Michael Vogt Wed, 11 Oct 2006 18:32:17 +0200 + update-manager (0.44.17) edgy; urgency=low * memory leak fixed (lp: #43096) diff --git a/debian/control b/debian/control index 7ed4c7a5..0702fa9e 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,7 @@ Standards-Version: 3.6.2 Package: update-manager Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus, python-vte, gksu -Recommends: python-gnome2 +Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus, python-vte, gksu, python-gconf Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user choose which to install. -- cgit v1.2.3