From 8da0ea4e985d947ff176d2f5e5eada1f1d255a1e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Jun 2006 10:19:54 +0200 Subject: * speedups in the MyCache.clear() code * minor code cleanups (move the depcache code into _initDepCcche()) --- UpdateManager/UpdateManager.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index d4cc7a59..109e4d0c 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -83,11 +83,19 @@ CHANGELOGS_URI="http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chan class MyCache(apt.Cache): def __init__(self, progress): apt.Cache.__init__(self, progress) + self._initDepCache() assert self._depcache.BrokenCount == 0 and self._depcache.DelCount == 0 self.all_changes = {} + def _initDepCache(self): + #apt_pkg.Config.Set("Debug::pkgPolicy","1") + #self.depcache = apt_pkg.GetDepCache(self.cache) + #self._depcache = apt_pkg.GetDepCache(self._cache) + self._depcache.ReadPinFile() + if os.path.exists(SYNAPTIC_PINFILE): + self._depcache.ReadPinFile(SYNAPTIC_PINFILE) + self._depcache.Init() def clean(self): - for pkg in self: - pkg.markKeep() + self._initDepCache() def saveDistUpgrade(self): """ this functions mimics a upgrade but will never remove anything """ self._depcache.Upgrade(True) @@ -755,13 +763,6 @@ class UpdateManager(SimpleGladeApp): sys.exit(1) else: progress.hide() - #apt_pkg.Config.Set("Debug::pkgPolicy","1") - #self.depcache = apt_pkg.GetDepCache(self.cache) - self.cache._depcache.ReadPinFile() - if os.path.exists(SYNAPTIC_PINFILE): - self.cache._depcache.ReadPinFile(SYNAPTIC_PINFILE) - self.cache._depcache.Init() - def check_auto_update(self): # Check if automatic update is enabled. If not show a dialog to inform -- cgit v1.2.3 From 19639e82319463cfb5c311155d63e06dd8ad5bde Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Aug 2006 10:07:30 +0200 Subject: * data/update-manager.schemas.in: - set check_dist_upgrades to True again * UpdateManager/DistUpgradeFetcher.py, UpdateManager/MetaRelease.py: - handle the situation when run as non-root * UpdateManager/UpdateManager.py: - cleanup (removed dead code) --- UpdateManager/DistUpgradeFetcher.py | 5 ++++- UpdateManager/MetaRelease.py | 10 +++++++--- UpdateManager/UpdateManager.py | 17 ----------------- data/update-manager.schemas.in | 2 +- po/ar.po | 5 ++--- po/bg.po | 6 +++--- po/bn.po | 6 +++--- po/br.po | 5 ++--- po/ca.po | 6 +++--- po/cs.po | 6 +++--- po/da.po | 6 +++--- po/de.po | 6 +++--- po/el.po | 6 +++--- po/en_AU.po | 6 +++--- po/en_CA.po | 5 ++--- po/en_GB.po | 5 ++--- po/es.po | 6 +++--- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/fur.po | 5 ++--- po/gl.po | 5 ++--- po/he.po | 5 ++--- po/hi.po | 5 ++--- po/hr.po | 6 +++--- po/hu.po | 6 +++--- po/id.po | 6 +++--- po/it.po | 6 +++--- po/ja.po | 6 +++--- po/ka.po | 5 ++--- po/ko.po | 6 +++--- po/ku.po | 5 ++--- po/lt.po | 6 +++--- po/mk.po | 5 ++--- po/ms.po | 5 ++--- po/nb.po | 6 +++--- po/ne.po | 5 ++--- po/nl.po | 6 +++--- po/no.po | 5 ++--- po/oc.po | 5 ++--- po/pa.po | 5 ++--- po/pl.po | 6 +++--- po/pt.po | 6 +++--- po/pt_BR.po | 6 +++--- po/ro.po | 5 ++--- po/ru.po | 6 +++--- po/rw.po | 5 ++--- po/sk.po | 6 +++--- po/sr.po | 5 ++--- po/sv.po | 6 +++--- po/th.po | 6 +++--- po/tr.po | 6 +++--- po/uk.po | 5 ++--- po/update-manager.pot | 5 ++--- po/ur.po | 5 ++--- po/urd.po | 5 ++--- po/vi.po | 5 ++--- po/xh.po | 5 ++--- po/zh_CN.po | 6 +++--- po/zh_HK.po | 5 ++--- po/zh_TW.po | 6 +++--- 60 files changed, 154 insertions(+), 190 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index aa51066a..4aacdae4 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -190,7 +190,10 @@ class DistUpgradeFetcher(object): def runDistUpgrader(self): #print "runing: %s" % script - os.execv(self.script,[]) + if os.getuid() != 0: + os.execv("/usr/bin/gksu",["gksu",self.script]) + else: + os.execv(self.script,[self.script]) def cleanup(self): # cleanup diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py index 57a808ee..70993eaf 100644 --- a/UpdateManager/MetaRelease.py +++ b/UpdateManager/MetaRelease.py @@ -60,8 +60,15 @@ class MetaRelease(gobject.GObject): def __init__(self, useDevelopmentRelase=False): gobject.GObject.__init__(self) + # check what uri to use if useDevelopmentRelase: self.METARELEASE_URI = self.METARELEASE_URI_UNSTABLE + # check if we can access the METARELEASE_FILE + if not os.access(self.METARELEASE_FILE, os.F_OK|os.W_OK|os.R_OK): + path = os.path.expanduser("~/.update-manager/") + if not os.path.exists(path): + os.mkdir(path) + self.METARELEASE_FILE = os.path.join(path,"meta-release") self.metarelease_information = None self.downloading = True # we start the download thread here and we have a timeout @@ -168,6 +175,3 @@ class MetaRelease(gobject.GObject): if os.path.exists(self.METARELEASE_FILE): f=open(self.METARELEASE_FILE,"r") -# register in the gobject system, needed for older versions of pygtk, -# never ones do this automatically -gobject.type_register(MetaRelease) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 109e4d0c..d1a680fb 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -695,23 +695,6 @@ class UpdateManager(SimpleGladeApp): fetcher.run() def new_dist_available(self, meta_release, upgradable_to): - #print "new_dist_available: %s" % upgradable_to.name - # check if the user already knowns about this dist - #seen = self.gconfclient.get_string("/apps/update-manager/seen_dist") - #if name == seen: - # return - - #msg = "%s\n\n%s" % (_("There is a new release of Ubuntu available!"), _("A new release with the codename '%s' is available. Please see http://www.ubuntulinux.org/ for upgrade instructions.") % name) - #dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_INFO, - # gtk.BUTTONS_CLOSE, "") - #dialog.set_markup(msg) - #check = gtk.CheckButton(_("Never show this message again")) - #check.show() - #dialog.vbox.pack_start(check) - #dialog.run() - #if check.get_active(): - # self.gconfclient.set_string("/apps/update-manager/seen_dist",name) - #dialog.destroy() self.frame_new_release.show() self.label_new_release.set_markup(_("New distribution release '%s' is available") % upgradable_to.version) self.new_dist = upgradable_to diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index 275f8be5..ad72c893 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -52,7 +52,7 @@ /apps/update-manager/check_dist_upgrades update-manager bool - False + True Check for new distribution releases diff --git a/po/ar.po b/po/ar.po index b25550fa..e3b7a07d 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi \n" "Language-Team: Arabic \n" @@ -559,8 +559,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/bg.po b/po/bg.po index de6df323..ab5a9315 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov \n" "Language-Team: Bulgarian \n" @@ -623,8 +623,8 @@ msgid "Start the upgrade?" msgstr "Започване на надграждането?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Надграждане до Ubuntu 6.06 LTS" diff --git a/po/bn.po b/po/bn.po index dcd7a2fb..0490bc35 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam \n" "Language-Team: Bengali \n" @@ -575,8 +575,8 @@ msgid "Start the upgrade?" msgstr "আপগ্রেড শুরু করবো?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড করছি" diff --git a/po/br.po b/po/br.po index 784f625b..7f2f655b 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse \n" "Language-Team: Breton \n" @@ -560,8 +560,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ca.po b/po/ca.po index 6da4ed56..d99c3c7f 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta \n" "Language-Team: Catalan \n" @@ -611,8 +611,8 @@ msgid "Start the upgrade?" msgstr "Voleu iniciar l'actualització?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "S'està actualitzant a Ubuntu 6.06 " "LTS" diff --git a/po/cs.po b/po/cs.po index 9387e60b..46455dbd 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála \n" "Language-Team: Czech \n" @@ -598,8 +598,8 @@ msgid "Start the upgrade?" msgstr "Spustit upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Přechází se na Ubuntu 6.06 LTS" diff --git a/po/da.po b/po/da.po index 8d2981b1..945665c1 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K \n" "Language-Team: Danish \n" @@ -612,8 +612,8 @@ msgid "Start the upgrade?" msgstr "Start opgraderinegn?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Opgraderer til Ubuntu 6.06 LTS" diff --git a/po/de.po b/po/de.po index 412385d2..62d0a33a 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein \n" "Language-Team: German GNOME Translations \n" @@ -643,8 +643,8 @@ msgid "Start the upgrade?" msgstr "Mit der Aktualisierung beginnen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Auf Ubuntu 6.06 LTS aktualisieren" diff --git a/po/el.po b/po/el.po index df431e8b..82637cee 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -632,8 +632,8 @@ msgid "Start the upgrade?" msgstr "Έναρξη της αναβάθμισης;" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Αναβάθμιση σε Ubuntu 6.06 LTS" diff --git a/po/en_AU.po b/po/en_AU.po index 983a7e36..b2fce2b8 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons \n" "Language-Team: English (Australia) \n" @@ -624,8 +624,8 @@ msgid "Start the upgrade?" msgstr "Start the upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Upgrading to Ubuntu 6.06 LTS" diff --git a/po/en_CA.po b/po/en_CA.po index ea0eb274..4a369995 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -572,8 +572,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/en_GB.po b/po/en_GB.po index 42f56e94..c52c6360 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" @@ -572,8 +572,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/es.po b/po/es.po index 8be24196..c94cd689 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López \n" "Language-Team: Spanish \n" @@ -641,8 +641,8 @@ msgid "Start the upgrade?" msgstr "¿Comenzar la actualización?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Actualizando a Ubuntu 6.06 LTS" diff --git a/po/fi.po b/po/fi.po index 4fb7509c..e2fdf322 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -626,8 +626,8 @@ msgid "Start the upgrade?" msgstr "Aloita päivitys?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Päivitetään jakeluun: Ubuntu 6.06 " "LTS" diff --git a/po/fr.po b/po/fr.po index d3d1746a..58dd3821 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" @@ -639,8 +639,8 @@ msgid "Start the upgrade?" msgstr "Démarrer la mise à jour ?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Mise à jour vers Ubuntu 6.06 LTS" diff --git a/po/fur.po b/po/fur.po index 256127d4..0f023bf6 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz \n" "Language-Team: Friulian \n" @@ -556,8 +556,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/gl.po b/po/gl.po index 1370f0da..e01f692f 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -577,8 +577,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/he.po b/po/he.po index 2b3b0c3b..11dd8e71 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir \n" "Language-Team: Hebrew \n" @@ -576,8 +576,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/hi.po b/po/hi.po index d0862c24..d74f18ea 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators \n" "Language-Team: Hindi \n" @@ -556,8 +556,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/hr.po b/po/hr.po index 85aa2a13..1ebed52d 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić \n" "Language-Team: Croatian \n" @@ -630,8 +630,8 @@ msgid "Start the upgrade?" msgstr "Pokrenuti nadogradnju?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Nadograđujem na Ubuntu 6.06 LTS" diff --git a/po/hu.po b/po/hu.po index a124cc27..751d60e4 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -626,8 +626,8 @@ msgid "Start the upgrade?" msgstr "Megkezdi a frissítést?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Frissítés az Ubuntu 6.06 LTS " "változatra" diff --git a/po/id.po b/po/id.po index 6f8f1983..9c376c9c 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani \n" "Language-Team: Indonesian \n" @@ -624,8 +624,8 @@ msgid "Start the upgrade?" msgstr "Mulai upgrade?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Mengupgrade ke Ubuntu 6.06 LTS" diff --git a/po/it.po b/po/it.po index f61c58f9..c8834742 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -637,8 +637,8 @@ msgid "Start the upgrade?" msgstr "Avviare l'aggiornamento?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Aggiornamento a Ubuntu 6.06 LTS" diff --git a/po/ja.po b/po/ja.po index 448e8696..b26d511a 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu Japanese Team \n" @@ -618,8 +618,8 @@ msgid "Start the upgrade?" msgstr "アップグレードを開始しますか？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Ubuntu 6.06 LTS にアップデート中" diff --git a/po/ka.po b/po/ka.po index 0e776ab9..58abf1cf 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian \n" @@ -605,8 +605,7 @@ msgstr " გაშვება" #: ../DistUpgrade/DistUpgrade.glade.h:7 #, fuzzy -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr " -სკენ" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ko.po b/po/ko.po index 227b519f..31af9cb9 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl \n" "Language-Team: Korean \n" @@ -612,8 +612,8 @@ msgid "Start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "우분투 6.06 LTS로 업그레이드하는 중" diff --git a/po/ku.po b/po/ku.po index 42644134..a847dcc4 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -556,8 +556,7 @@ msgid "Start the upgrade?" msgstr "Dest bi bilindkirinê were kirin?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/lt.po b/po/lt.po index 0e5df421..d528796e 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" @@ -619,8 +619,8 @@ msgid "Start the upgrade?" msgstr "Pradėti atnaujinimą?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Atnaujinama į Ubuntu 6.06 LTS" diff --git a/po/mk.po b/po/mk.po index 3ca8f9bb..ec6d72ed 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -580,8 +580,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ms.po b/po/ms.po index baba9a1a..bd5ccaea 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux \n" "Language-Team: Malay \n" @@ -593,8 +593,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/nb.po b/po/nb.po index 0edbc0c9..2f015f9f 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland \n" "Language-Team: Norwegian Bokmal \n" @@ -629,8 +629,8 @@ msgid "Start the upgrade?" msgstr "Vil du starte oppgraderingen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Oppgraderer til Ubuntu 6.06 LTS" diff --git a/po/ne.po b/po/ne.po index cbef83ef..d186e5ad 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -569,8 +569,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/nl.po b/po/nl.po index 9efe0175..566c4663 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen \n" "Language-Team: Nederlands \n" @@ -634,8 +634,8 @@ msgid "Start the upgrade?" msgstr "Upgrade starten?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Bezig met upgraden naar Ubuntu 6.06 " "LTS" diff --git a/po/no.po b/po/no.po index 1b04ca84..0450f229 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -573,8 +573,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/oc.po b/po/oc.po index a2209808..9f6a934b 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n" @@ -563,8 +563,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/pa.po b/po/pa.po index 3e5fd974..5fff5a52 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -559,8 +559,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/pl.po b/po/pl.po index b37d0d39..f3e2c10f 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Polish \n" @@ -629,8 +629,8 @@ msgid "Start the upgrade?" msgstr "Rozpocząć aktualizację?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Aktualizacja do Ubuntu 6.06 LTS" diff --git a/po/pt.po b/po/pt.po index 1e9fe9db..86cd5af4 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho \n" "Language-Team: Ubuntu Portuguese Team \n" @@ -629,8 +629,8 @@ msgid "Start the upgrade?" msgstr "Iniciar a actualização?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "A actualizar para Ubuntu 6.06 LTS" diff --git a/po/pt_BR.po b/po/pt_BR.po index cb3c8c2c..0cd6d801 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut \n" "Language-Team: Ubuntu-BR \n" @@ -631,8 +631,8 @@ msgid "Start the upgrade?" msgstr "Iniciar a Atualização?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Atualizando para o Ubuntu 6.06 LTS" diff --git a/po/ro.po b/po/ro.po index e73adf0f..8b4e20f2 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA \n" "Language-Team: Romanian \n" @@ -580,8 +580,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ru.po b/po/ru.po index c14af2cf..aeab7e61 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev \n" "Language-Team: Russian \n" @@ -626,8 +626,8 @@ msgid "Start the upgrade?" msgstr "Начать обновление?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Обновление до Ubuntu 6.06 LTS" diff --git a/po/rw.po b/po/rw.po index abba200e..e4646d6f 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -574,8 +574,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/sk.po b/po/sk.po index 974215ac..a85d7a7a 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada \n" "Language-Team: Slovak \n" @@ -626,8 +626,8 @@ msgid "Start the upgrade?" msgstr "Spustiť aktualizáciu?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Prebieha aktualizácia na Ubuntu 6.06 " "LTS" diff --git a/po/sr.po b/po/sr.po index 7a432396..68f60b4a 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic \n" "Language-Team: Serbian \n" @@ -560,8 +560,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/sv.po b/po/sv.po index 03fe3e20..9c68eb2e 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors \n" "Language-Team: Swedish \n" @@ -627,8 +627,8 @@ msgid "Start the upgrade?" msgstr "Starta uppgraderingen?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Uppdaterar till Ubuntu 6.06 LTS" diff --git a/po/th.po b/po/th.po index d42d3b0f..ad26059c 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul \n" "Language-Team: Thai \n" @@ -599,8 +599,8 @@ msgid "Start the upgrade?" msgstr "เริ่มการปรับปรุงหรือไม่?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "กำลังปรับปรุงอูบันตู 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/tr.po b/po/tr.po index e8018237..3432b48b 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI \n" "Language-Team: Turkish \n" @@ -573,8 +573,8 @@ msgid "Start the upgrade?" msgstr "Yükseltme başlatılsın mı?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "Ubuntu 6.06 LTS'ya yükseltiliyor" diff --git a/po/uk.po b/po/uk.po index 322af381..4f9d4477 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff \n" "Language-Team: Ukrainian \n" @@ -590,8 +590,7 @@ msgid "Start the upgrade?" msgstr "Почати апгрейд системи?" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/update-manager.pot b/po/update-manager.pot index 897a7804..e3c9c7b9 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -556,8 +556,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/ur.po b/po/ur.po index 3464b679..6b15c85d 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -557,8 +557,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/urd.po b/po/urd.po index 18e68cec..ec89cf4b 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید \n" "Language-Team: Urdu \n" @@ -557,8 +557,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/vi.po b/po/vi.po index c03e91e0..e7235f90 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung \n" "Language-Team: Vietnamese \n" @@ -562,8 +562,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/xh.po b/po/xh.po index e519731a..05af4f99 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -557,8 +557,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/zh_CN.po b/po/zh_CN.po index d9e7edab..f2881f39 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_CN \n" @@ -594,8 +594,8 @@ msgid "Start the upgrade?" msgstr "开始升级？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "" "正在升级到 Ubuntu 6.06 LTS" diff --git a/po/zh_HK.po b/po/zh_HK.po index b89955ac..5ef6fb94 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -565,8 +565,7 @@ msgid "Start the upgrade?" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +msgid "Upgrading to Ubuntu 6.10" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 diff --git a/po/zh_TW.po b/po/zh_TW.po index 5d0bb9d7..b048f48e 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-07-31 21:12+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan \n" "Language-Team: Chinese (Taiwan) \n" @@ -588,8 +588,8 @@ msgid "Start the upgrade?" msgstr "開始升級？" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"Upgrading to Ubuntu 6.06 LTS" +#, fuzzy +msgid "Upgrading to Ubuntu 6.10" msgstr "升級至 Ubuntu 6.06 LTS" #: ../DistUpgrade/DistUpgrade.glade.h:8 -- cgit v1.2.3 From 6de4c375de972ad34a15dbe56305d62e8faa23a0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Aug 2006 12:41:24 +0200 Subject: * UpdateManager/UpdateManager.py: - implemented support to show what origin the update comes from --- UpdateManager/UpdateManager.py | 104 ++++++++++++++++++++++++++++------------- debian/changelog | 1 + 2 files changed, 73 insertions(+), 32 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index d1a680fb..ce46d737 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -69,8 +69,7 @@ from MetaRelease import Dist, MetaRelease # - kill "all_changes" and move the changes into the "Update" class # list constants -(LIST_INSTALL, LIST_CONTENTS, LIST_NAME, LIST_SHORTDESC, - LIST_VERSION, LIST_LONG_DESCR, LIST_PKG) = range(7) +(LIST_INSTALL, LIST_CONTENTS, LIST_NAME, LIST_PKG) = range(4) # actions for "invoke_manager" (INSTALL, UPDATE) = range(2) @@ -201,23 +200,43 @@ class MyCache(apt.Cache): lock.release() class UpdateList: + ORIGIN_MAPPING = { ("edgy-security","Ubuntu"): _("Ubuntu security updates"), + ("edgy-updates","Ubuntu"): _("Ubuntu important updates updates"), + ("edgy","Ubuntu"): _("Ubuntu updates") + } + def __init__(self, parent_window): - self.pkgs = [] + # a map of packages under their origin + self.pkgs = {} self.num_updates = 0 self.parent_window = parent_window def update(self, cache): held_back = [] broken = [] + + # do the upgrade cache.saveDistUpgrade() + + # sort by origin for pkg in cache: if pkg.markedUpgrade or pkg.markedInstall: - self.pkgs.append(pkg) + originstr = _("Unknown") + for aorigin in pkg.candidateOrigin: + archive = aorigin.archive + origin = aorigin.origin + if self.ORIGIN_MAPPING.has_key((archive,origin)) and aorigin.trusted: + originstr = self.ORIGIN_MAPPING[(archive,origin)] + if not self.pkgs.has_key(originstr): + self.pkgs[originstr] = [] + self.pkgs[originstr].append(pkg) self.num_updates = self.num_updates + 1 elif pkg.isUpgradable: - #print "MarkedKeep: %s " % pkg.name held_back.append(pkg.name) - self.pkgs.sort(lambda x,y: cmp(x.name,y.name)) + for l in self.pkgs.keys(): + self.pkgs[l].sort(lambda x,y: cmp(x.name,y.name)) + + # check if we have held-back something if cache._depcache.KeepCount > 0: #print "WARNING, keeping packages" msg = ("%s\n\n%s" % \ @@ -295,32 +314,34 @@ class UpdateManager(SimpleGladeApp): self.button_close.connect("clicked", lambda w: self.exit()) # the treeview (move into it's own code!) - self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str, str, str, str, - gobject.TYPE_PYOBJECT) + self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str, gobject.TYPE_PYOBJECT) self.treeview_update.set_model(self.store) self.treeview_update.set_headers_clickable(True); tr = gtk.CellRendererText() tr.set_property("xpad", 10) tr.set_property("ypad", 10) - cr = gtk.CellRendererToggle() + self.cr = cr = gtk.CellRendererToggle() cr.set_property("activatable", True) cr.set_property("xpad", 10) cr.connect("toggled", self.toggled) - self.cb = gtk.TreeViewColumn("Install", cr, active=LIST_INSTALL) - c0 = gtk.TreeViewColumn("Name", tr, markup=LIST_CONTENTS) - c0.set_resizable(True) + + column_install = gtk.TreeViewColumn("Install", cr) + column_install.set_cell_data_func (cr, self.install_column_view_func) + column = gtk.TreeViewColumn("Name", tr, markup=LIST_CONTENTS) + column.set_cell_data_func (tr, self.package_column_view_func) + column.set_resizable(True) major,minor,patch = gtk.pygtk_version if (major >= 2) and (minor >= 5): - self.cb.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - self.cb.set_fixed_width(30) - c0.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - c0.set_fixed_width(100) + column_install.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + column_install.set_fixed_width(30) + column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + column.set_fixed_width(100) #self.treeview_update.set_fixed_height_mode(True) - self.treeview_update.append_column(self.cb) - self.cb.set_visible(True) - self.treeview_update.append_column(c0) + self.treeview_update.append_column(column_install) + column_install.set_visible(True) + self.treeview_update.append_column(column) self.treeview_update.set_search_column(LIST_NAME) @@ -356,6 +377,23 @@ class UpdateManager(SimpleGladeApp): self.restore_state() self.window_main.show() + def header_column_func(self, cell_layot, renderer, model, iter): + pkg = model.get_value(iter, LIST_PKG) + if pkg == None: + renderer.set_property("cell-background","green") + else: + renderer.set_property("cell-background", None) + + def install_column_view_func(self, cell_layout, renderer, model, iter): + self.header_column_func(cell_layout, renderer, model, iter) + pkg = model.get_value(iter, LIST_PKG) + if self.cr == renderer: + renderer.set_property("visible", pkg != None) + + + def package_column_view_func(self, cell_layout, renderer, model, iter): + self.header_column_func(cell_layout, renderer, model, iter) + def setupDbus(self): """ this sets up a dbus listener if none is installed alread """ # check if there is another g-a-i already and if not setup one @@ -429,7 +467,10 @@ class UpdateManager(SimpleGladeApp): iter = model.get_iter(path) # set descr - long_desc = model.get_value(iter, LIST_LONG_DESCR) + pkg = model.get_value(iter, LIST_PKG) + if pkg == None: + return + long_desc = pkg.description if long_desc == None: return # Skip the first line - it's a duplicate of the summary @@ -526,7 +567,7 @@ class UpdateManager(SimpleGladeApp): self.notebook_details.set_sensitive(True) self.treeview_update.set_sensitive(True) self.button_install.grab_default() - self.treeview_update.set_cursor(0) + self.treeview_update.set_cursor(1) self.label_header.set_markup(text_header) self.label_downsize.set_markup(text_download) @@ -657,17 +698,16 @@ class UpdateManager(SimpleGladeApp): self.list.update(self.cache) if self.list.num_updates > 0: i=0 - for pkg in self.list.pkgs: - - name = xml.sax.saxutils.escape(pkg.name) - summary = xml.sax.saxutils.escape(pkg.summary) - contents = "%s\n%s\n\n" % (name, summary) - contents = contents + _("New version: %s (Size: %s)") % (pkg.candidateVersion,apt.SizeToStr(pkg.packageSize)) + "" - - iter = self.store.append([True, contents, pkg.name, pkg.summary, - pkg.candidateVersion, pkg.description, pkg]) - self.add_update(pkg) - i = i + 1 + for origin in self.list.pkgs.keys(): + self.store.append([False, '%s' % origin, origin, None]) + for pkg in self.list.pkgs[origin]: + name = xml.sax.saxutils.escape(pkg.name) + summary = xml.sax.saxutils.escape(pkg.summary) + contents = "%s\n%s\n\n" % (name, summary) + contents = contents + _("New version: %s (Size: %s)") % (pkg.candidateVersion,apt.SizeToStr(pkg.packageSize)) + "" + iter = self.store.append([True, contents, pkg.name, pkg]) + self.add_update(pkg) + i = i + 1 self.update_count() # use the normal cursor diff --git a/debian/changelog b/debian/changelog index c5347d2e..cfad987e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ update-manager (0.44.1) edgy; urgency=low * make UpdateManager check for new distribution releases by default again * fix dist-upgrade fetching when run as root. + * sort the package list by the origin (UpdateManagerEdgy spec) -- -- cgit v1.2.3 From 34eb9fd012b1edfb460642ce7678c28fb0840ed1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Aug 2006 12:58:46 +0200 Subject: * UpdateManager/UpdateManager.py: - use "yellow" instead of "green" - bugfixes in the new column header code --- UpdateManager/UpdateManager.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index ce46d737..2e2433a8 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -201,7 +201,8 @@ class MyCache(apt.Cache): class UpdateList: ORIGIN_MAPPING = { ("edgy-security","Ubuntu"): _("Ubuntu security updates"), - ("edgy-updates","Ubuntu"): _("Ubuntu important updates updates"), + ("edgy-updates","Ubuntu"): _("Ubuntu important updates"), + ("edgy-backports","Ubuntu"): _("Ubuntu backports"), ("edgy","Ubuntu"): _("Ubuntu updates") } @@ -321,7 +322,7 @@ class UpdateManager(SimpleGladeApp): tr = gtk.CellRendererText() tr.set_property("xpad", 10) tr.set_property("ypad", 10) - self.cr = cr = gtk.CellRendererToggle() + cr = gtk.CellRendererToggle() cr.set_property("activatable", True) cr.set_property("xpad", 10) cr.connect("toggled", self.toggled) @@ -380,16 +381,17 @@ class UpdateManager(SimpleGladeApp): def header_column_func(self, cell_layot, renderer, model, iter): pkg = model.get_value(iter, LIST_PKG) if pkg == None: - renderer.set_property("cell-background","green") + renderer.set_property("cell-background","yellow") else: renderer.set_property("cell-background", None) def install_column_view_func(self, cell_layout, renderer, model, iter): self.header_column_func(cell_layout, renderer, model, iter) pkg = model.get_value(iter, LIST_PKG) - if self.cr == renderer: - renderer.set_property("visible", pkg != None) - + to_install = model.get_value(iter, LIST_INSTALL) + renderer.set_property("active", to_install) + # hide it if we are only a header line + renderer.set_property("visible", pkg != None) def package_column_view_func(self, cell_layout, renderer, model, iter): self.header_column_func(cell_layout, renderer, model, iter) @@ -435,24 +437,17 @@ class UpdateManager(SimpleGladeApp): return for line in lines: - end_iter = changes_buffer.get_end_iter() - - version_match = re.match(r'^%s \((.*)\)(.*)$' % re.escape(srcpkg), line) + version_match = re.match(r'^%s \((.*)\)(.*)\;.*$' % re.escape(srcpkg), line) #bullet_match = re.match("^.*[\*-]", line) author_match = re.match("^.*--.*<.*@.*>.*$", line) if version_match: version = version_match.group(1) + upload_archive = version_match.group(2).strip() version_text = _("Version %s: \n") % version changes_buffer.insert_with_tags_by_name(end_iter, version_text, "versiontag") - # mvo: disabled for now as it does not catch multi line entries - # (see ubuntu #7034 for rational) - #elif bullet_match and not author_match: - # bullet_text = " " + line + "\n" - # changes_buffer.insert(end_iter, bullet_text) elif (author_match): pass - #chanages_buffer.insert(end_iter, "\n") else: changes_buffer.insert(end_iter, line+"\n") -- cgit v1.2.3