From e1a1eeefa2d7a681f6583b7520031fd71daad862 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Sep 2006 21:37:18 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - added edgyQuirks handling for python transition --- DistUpgrade/DistUpgradeCache.py | 16 ++++++++++++++++ DistUpgrade/DistUpgradeControler.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 318c30cd..e5b7ed09 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -164,6 +164,22 @@ class MyCache(apt.Cache): if func is not None: func() + def edgyQuirks(self): + """ this function works around quirks in the dapper->edgy upgrade """ + logging.debug("running edgyQuirks handler") + for pkg in self: + if (pkg.name.startswith("python2.4") and + pkg.isInstalled and + not pkg.markedUpgrade): + newpkg = "python-"+pkg.name[len("python2.4"):-1] + if (self.has_key(newpkg) and + not self[newpkg].markedInstall): + try: + self.markInstall(pkg.name, + "python2.4->python upgrade rule") + except SystemError, e: + logging.debug("Failed to install: %s (%s)" % (newpkg, e)) + def dapperQuirks(self): """ this function works around quirks in the breezy->dapper upgrade """ logging.debug("running dapperQuirks handler") diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 7b255cf0..1d714325 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -644,7 +644,7 @@ class DistUpgradeControler(object): else: args.append("--without-network") os.execve(sys.argv[0],args, os.environ) - + # this is the core def edgyUpgrade(self): # sanity check (check for ubuntu-desktop, brokenCache etc) -- cgit v1.2.3 From f7dc0ba8a869e8cbf1807bb90da82e540291806f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Sep 2006 22:34:54 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - make the edgyQuirks work for the python2.4->python transition --- DistUpgrade/DistUpgradeCache.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index e5b7ed09..6dd1983d 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -167,18 +167,18 @@ class MyCache(apt.Cache): def edgyQuirks(self): """ this function works around quirks in the dapper->edgy upgrade """ logging.debug("running edgyQuirks handler") + # deal with the python2.4-$foo -> python-$foo transition for pkg in self: - if (pkg.name.startswith("python2.4") and + if (pkg.name.startswith("python2.4-") and pkg.isInstalled and not pkg.markedUpgrade): - newpkg = "python-"+pkg.name[len("python2.4"):-1] - if (self.has_key(newpkg) and - not self[newpkg].markedInstall): + basepkg = "python-"+pkg.name[len("python2.4-"):] + if (self.has_key(basepkg) and not self[basepkg].markedInstall): try: - self.markInstall(pkg.name, + self.markInstall(basepkg, "python2.4->python upgrade rule") except SystemError, e: - logging.debug("Failed to install: %s (%s)" % (newpkg, e)) + logging.debug("Failed to apply python2.4->python install: %s (%s)" % (newpkg, e)) def dapperQuirks(self): """ this function works around quirks in the breezy->dapper upgrade """ -- cgit v1.2.3 From 588cd00384f0ac4de95a56d28f248f2298b05fbc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Sep 2006 22:55:44 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - hpijs quirk --- DistUpgrade/DistUpgradeCache.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 6dd1983d..7b91f4ed 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -179,6 +179,15 @@ class MyCache(apt.Cache): "python2.4->python upgrade rule") except SystemError, e: logging.debug("Failed to apply python2.4->python install: %s (%s)" % (newpkg, e)) + # deal with $$/&$ hpijs + if (self.has_key("hpijs") and self["hpijs"].isInstalled and + not self["hpijs"].markedUpgrade): + try: + self.markInstall("hpijs","hpijs quirk upgrade rule") + except SystemError, e: + logging.debug("Failed to apply hpijs install (%s)" % e) + + def dapperQuirks(self): """ this function works around quirks in the breezy->dapper upgrade """ -- cgit v1.2.3 From 359989e5177a6c376380d6d00003b5ea19403f0e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 00:13:27 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - fixed comment --- DistUpgrade/DistUpgradeCache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 7b91f4ed..453efe92 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -179,7 +179,7 @@ class MyCache(apt.Cache): "python2.4->python upgrade rule") except SystemError, e: logging.debug("Failed to apply python2.4->python install: %s (%s)" % (newpkg, e)) - # deal with $$/&$ hpijs + # deal with *gar*gar* hpijs if (self.has_key("hpijs") and self["hpijs"].isInstalled and not self["hpijs"].markedUpgrade): try: -- 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 'DistUpgrade') 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 ee0ae3876d6e3afc36197fb922c6fdab2dd04688 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sat, 30 Sep 2006 02:15:17 +0200 Subject: * improve the grammar - fix #63039 --- DistUpgrade/DistUpgradeViewGtk.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 1385d18f..2b0914f4 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -200,9 +200,8 @@ 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 loose all customizations, that have been made by " - "yourself or by a script, if you replace the file by its " - "latest version.") + sec = _("You will lose any local changes to this file " + "if you replace this file with the latest 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) -- 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 'DistUpgrade') 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 6a04c04bbe1639c732a250ab003d6e2b29bffc90 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Oct 2006 14:52:56 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - fix more incorrect _() usage --- DistUpgrade/DistUpgradeControler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 1d714325..52f4f785 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -75,7 +75,7 @@ class AptCdrom(object): _("There was a error adding the CD, the " "upgrade will abort. Please report this as " "a bug if this is a valid Ubuntu CD.\n\n" - "The error message was:\n'%s'" % e)) + "The error message was:\n'%s'") % e) return False logging.debug("AptCdrom.add() returned: %s" % res) return res @@ -613,7 +613,7 @@ class DistUpgradeControler(object): uri = match.group(1) + path apt_pkg.GetPkgAcqFile(fetcher, uri=uri, size=ver.Size, - descr=_("Fetching backport of '%s'" % pkgname)) + descr=_("Fetching backport of '%s'") % pkgname) res = fetcher.Run() if res != fetcher.ResultContinue: # ick! error ... -- cgit v1.2.3 From 2c928a9b6c3f88181ac34e3424ffdafabacee17f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Oct 2006 15:19:15 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - deal better with initial cache failures (e.g. because of broken sources.list) --- DistUpgrade/DistUpgradeControler.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 52f4f785..1f948d1f 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -142,7 +142,11 @@ class DistUpgradeControler(object): def prepare(self): """ initial cache opening, sanity checking, network checking """ - self.openCache() + try: + self.openCache() + except SystemError, e: + logging.error("openCache() failed: '%s'" % e) + return False if not self.cache.sanityCheck(self._view): return False # FIXME: we may try to find out a bit more about the network @@ -652,7 +656,14 @@ class DistUpgradeControler(object): self._view.setStep(1) if not self.prepare(): - self.abort(1) + self._view.error(_("Preparing the upgrade failed"), + _("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." )) + sys.exit(1) # mvo: commented out for now, see #54234, this needs to be # refactored to use a arch=any tarball -- 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 'DistUpgrade') 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 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 'DistUpgrade') 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 'DistUpgrade') 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 'DistUpgrade') 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 6bc9ba7df538a541965d610490c19dd329496f53 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 20:06:55 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - log free diskspace --- DistUpgrade/Changelog | 2 ++ DistUpgrade/DistUpgradeControler.py | 12 ++++++++++++ 2 files changed, 14 insertions(+) (limited to 'DistUpgrade') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 5f7ba584..bfd8d4bd 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,5 @@ +2006-10-04: + - improve the space checking/logging 2006-09-29: - typo fix (thanks to Jane Silber) (lp: #62946) 2006-09-28: diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 1f948d1f..7b35f3c8 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -372,6 +372,18 @@ class DistUpgradeControler(object): "packages of former installations using " "'sudo apt-get clean'.") + # gather/log some staticts + mnt_map = {} + for d in ["/","/usr","/var","/boot"]: + st = os.statvfs(d) + free = st[statvfs.F_BAVAIL]*st[statvfs.F_FRSIZE] + if st in mnt_map: + logging.debug("Dir %s mounted on %s" % (d,mnt_map[st])) + else: + logging.debug("Free space on %s: %s" % (d,free)) + mnt_map[st] = d + del mnt_map + # first check for /var (or where the archives are downloaded too) archivedir = apt_pkg.Config.FindDir("Dir::Cache::archives") st_archivedir = os.statvfs(archivedir) -- cgit v1.2.3 From 3371259be1e936405b16bc447d6e90aab4809f81 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 20:55:22 +0200 Subject: * DistUpgrade/DistUpgradeCache.py: - protect against KeyErrors as well --- DistUpgrade/DistUpgradeCache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 1a7911c0..7d0d27e0 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -348,7 +348,7 @@ class MyCache(apt.Cache): self._inRemovalBlacklist(pkg.name): self.restore_snapshot() return False - except SystemError,e: + except (SystemError,KeyError),e: loggging.warning("_tryMarkObsoleteForRemoval failed for '%s' (%s)" % (pkgname,e)) self.restore_snapshot() return False -- 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 'DistUpgrade') 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 6b4f894acf07ee65b217dcdff5366d2bf4912d94 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Oct 2006 12:29:50 +0200 Subject: * DistUpgrade/DistUpgradeViewText.py: - added for text-mode installs --- DistUpgrade/DistUpgrade.cfg | 1 + DistUpgrade/DistUpgradeViewText.py | 196 +++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 DistUpgrade/DistUpgradeViewText.py (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index c83f9014..f399a1f5 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -1,6 +1,7 @@ [View] View=DistUpgradeViewGtk #View=DistUpgradeViewNonInteractive +#View=DistUpgradeViewText # Distro contains global information about the upgrade [Distro] diff --git a/DistUpgrade/DistUpgradeViewText.py b/DistUpgrade/DistUpgradeViewText.py new file mode 100644 index 00000000..b3bd61e3 --- /dev/null +++ b/DistUpgrade/DistUpgradeViewText.py @@ -0,0 +1,196 @@ +# DistUpgradeViewText.py +# +# Copyright (c) 2004-2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import sys +import logging +import time +import subprocess + +import apt +import apt_pkg +import os + +from apt.progress import InstallProgress +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, estimatedDownloadTime + +import gettext +from gettext import gettext as _ + +class TextCdromProgressAdapter(apt.progress.CdromProgress): + """ Report the cdrom add progress """ + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + print "%s (%f)" % (text, step/float(self.totalSteps)*100) + def askCdromName(self): + return (False, "") + def changeCdrom(self): + return False + + +class DistUpgradeViewText(DistUpgradeView): + " text frontend of the distUpgrade tool " + def __init__(self, datadir=None): + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + else: + localedir="/usr/share/locale/update-manager" + + try: + gettext.bindtextdomain("update-manager", localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + self.last_step = 0 # keep a record of the latest step + self._opCacheProgress = apt.progress.OpTextProgress() + self._fetchProgress = apt.progress.TextFetchProgress() + self._cdromProgress = TextCdromProgressAdapter() + self._installProgress = apt.progress.InstallProgress() + sys.excepthook = self._handleException + + def _handleException(self, type, value, tb): + import traceback + lines = traceback.format_exception(type, value, tb) + logging.error("not handled expection:\n%s" % "\n".join(lines)) + self.error(_("A fatal error occured"), + _("Please report this as 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."), + "\n".join(lines)) + sys.exit(1) + + def getFetchProgress(self): + return self._fetchProgress + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + def getOpCacheProgress(self): + return self._opCacheProgress + def getCdromProgress(self): + return self._cdromProgress + def updateStatus(self, msg): + print msg + def abort(self): + print _("Aborting") + def setStep(self, step): + self.last_step = step + def information(self, summary, msg, extended_msg=None): + print summary + print msg + if extended_msg: + print extended_msg + def error(self, summary, msg, extended_msg=None): + print summary + print msg + if extended_msg: + print extended_msg + return False + def confirmChanges(self, summary, changes, downloadSize, actions=None): + DistUpgradeView.confirmChanges(self, summary, changes, downloadSize, actions) + pkgs_remove = len(self.toRemove) + pkgs_inst = len(self.toInstall) + pkgs_upgrade = len(self.toUpgrade) + msg = "" + + 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("%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("%d new package is going to be " + "installed.", + "%d new packages are going to be " + "installed.",pkgs_inst) % pkgs_inst + msg += " " + if pkgs_upgrade > 0: + msg += gettext.ngettext("%d package is going to be upgraded.", + "%d packages are going to be upgraded.", + pkgs_upgrade) % pkgs_upgrade + msg +=" " + if downloadSize > 0: + msg += _("\n\nYou have to download a total of %s. ") %\ + apt_pkg.SizeToStr(downloadSize) + msg += estimatedDownloadTime(downloadSize) + msg += "." + if (pkgs_upgrade + pkgs_inst + pkgs_remove) > 100: + msg += "\n\n%s" % _("Fetching and installing the upgrade can take several hours and "\ + "cannot be canceled at any time later.") + + # Show an error if no actions are planned + if (pkgs_upgrade + pkgs_inst + pkgs_remove) < 1: + # FIXME: this should go into DistUpgradeController + summary = _("Your system is up-to-date") + msg = _("There are no upgrades available for your system. " + "The upgrade will now be canceled.") + self.error(summary, msg) + return False + + return self.askYesNoQuestion(summary, msg) + + def askYesNoQuestion(self, summary, msg): + print summary + print msg + print _("Continue [Yn] "), + res = sys.stdin.readline() + if res.strip().lower().startswith("y"): + return True + return False + + def confirmRestart(self): + return self.askYesNoQuestion(_("Restart required"), + _("To fully ugprade, please restart")) + + +if __name__ == "__main__": + + view = DistUpgradeViewText() + view.confirmChanges("xx",[], 100) + sys.exit(0) + + fp = apt.progress.TextFetchProgress() + ip = apt.progress.InstallProgress() + + cache = apt.Cache() + for pkg in sys.argv[1:]: + cache[pkg].markInstall() + cache.commit(fp,ip) + + #sys.exit(0) + view.getTerminal().call(["dpkg","--configure","-a"]) + #view.getTerminal().call(["ls","-R","/usr"]) + view.error("short","long", + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + ) + view.confirmChanges("xx",[], 100) + print view.askYesNoQuestion("hello", "Icecream?") -- 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 'DistUpgrade') 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