* moved aptsources into the Common directory

61 files changed, 63 insertions, 62 deletions

diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade
index 91d5b33f..a31df120 100644
--- a/DistUpgrade/DistUpgrade.glade
+++ b/DistUpgrade/DistUpgrade.glade
@@ -38,7 +38,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label_title">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Upgrading to Ubuntu 6.06 LTS&lt;/span&gt;</property>
+	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Upgrading to Ubuntu 6.10&lt;/span&gt;</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh
index a30e40a0..4f88b848 100755
--- a/DistUpgrade/build-tarball.sh
+++ b/DistUpgrade/build-tarball.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DIST=dapper
+DIST=edgy
 
 # cleanup
 rm -f *~ *.bak *.pyc *.moved '#'*
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 35793151..18e5d260 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -38,7 +38,7 @@ import re
 
 from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp
 from UpdateManager.Common.HelpViewer import HelpViewer
-import aptsources
+import UpdateManager.Common.aptsources as aptsources
 import dialog_add
 import dialog_edit
 import dialog_cache_outdated
diff --git a/SoftwareProperties/aptsources.py b/UpdateManager/Common/aptsources.py
index a4d16fa0..fce06c2b 100644
--- a/SoftwareProperties/aptsources.py
+++ b/UpdateManager/Common/aptsources.py
@@ -205,9 +205,10 @@ class SourceEntry:
     
 # the SourceList file as a class
 class SourcesList:
-  def __init__(self):
+  def __init__(self, withMatcher=True):
     self.list = []      # of Type SourceEntries
-    self.matcher = SourceEntryMatcher()
+    if withMatcher:
+      self.matcher = SourceEntryMatcher()
     self.refresh()
 
   def refresh(self):
diff --git a/po/ar.po b/po/ar.po
index cbcf3459..b25550fa 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:46+0000\n"
 "Last-Translator: Jadmadi <contact@jadmadi.net>\n"
 "Language-Team: Arabic <ar@li.org>\n"
diff --git a/po/bg.po b/po/bg.po
index 83cf9797..de6df323 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:40+0000\n"
 "Last-Translator: Nikola Kasabov <nikola.kasabov@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
diff --git a/po/bn.po b/po/bn.po
index 199defa6..dcd7a2fb 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-26 12:09+0000\n"
 "Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n"
 "Language-Team: Bengali <bn@li.org>\n"
diff --git a/po/br.po b/po/br.po
index d68c230c..784f625b 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-19 02:42+0000\n"
 "Last-Translator: Oublieuse <oublieuse@gmail.com>\n"
 "Language-Team: Breton <br@li.org>\n"
diff --git a/po/ca.po b/po/ca.po
index f2987b80..6da4ed56 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-29 21:18+0000\n"
 "Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
diff --git a/po/cs.po b/po/cs.po
index 73071fc3..9387e60b 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-25 18:52+0000\n"
 "Last-Translator: Tomáš Hála <tomas@monty.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index aed71b7e..8d2981b1 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:41+0000\n"
 "Last-Translator: Mathias-K <mathias@computergeil.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
diff --git a/po/de.po b/po/de.po
index 51276339..412385d2 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-27 10:58+0000\n"
 "Last-Translator: Sebastian Heinlein <glatzor@gmx.de>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
diff --git a/po/el.po b/po/el.po
index 253457db..df431e8b 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-25 15:39+0000\n"
 "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
diff --git a/po/en_AU.po b/po/en_AU.po
index 0cfccae4..983a7e36 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-26 21:06+0000\n"
 "Last-Translator: David Symons <david.symons@liberatedcomputing.net>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
diff --git a/po/en_CA.po b/po/en_CA.po
index 6f6246f2..ea0eb274 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:41+0000\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index dcea5c7d..42f56e94 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:41+0000\n"
 "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
 "Language-Team: \n"
diff --git a/po/es.po b/po/es.po
index 97430b97..8be24196 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-26 09:38+0000\n"
 "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
diff --git a/po/fi.po b/po/fi.po
index b01d2588..4fb7509c 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-25 18:26+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
diff --git a/po/fr.po b/po/fr.po
index 519fef68..d3d1746a 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-26 21:09+0000\n"
 "Last-Translator: Claude Paroz <paroz@email.ch>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
diff --git a/po/fur.po b/po/fur.po
index 3c3aedae..256127d4 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-30 14:37+0000\n"
 "Last-Translator: marcuz <marcuz@linux.it>\n"
 "Language-Team: Friulian <fur@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index e0da8cea..1370f0da 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:42+0000\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego\n"
diff --git a/po/he.po b/po/he.po
index d489f76d..2b3b0c3b 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-30 11:15+0000\n"
 "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
diff --git a/po/hi.po b/po/hi.po
index 8d75639f..d0862c24 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:46+0000\n"
 "Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n"
 "Language-Team: Hindi <hi@li.org>\n"
diff --git a/po/hr.po b/po/hr.po
index 6082643e..85aa2a13 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-24 20:54+0000\n"
 "Last-Translator: Ante Karamatić <ivoks@ubuntu.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
diff --git a/po/hu.po b/po/hu.po
index fa0ec160..a124cc27 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-28 21:22+0000\n"
 "Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
diff --git a/po/id.po b/po/id.po
index c15dbb90..6f8f1983 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-28 18:46+0000\n"
 "Last-Translator: Andy Apdhani <imtheface@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
diff --git a/po/it.po b/po/it.po
index b5004cf1..f61c58f9 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-24 14:01+0000\n"
 "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n"
 "Language-Team: Italian <it@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 7eca8a7a..448e8696 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-24 07:06+0000\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n"
diff --git a/po/ka.po b/po/ka.po
index 47e5af28..0e776ab9 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:19+0000\n"
 "Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n"
 "Language-Team: Georgian <geognome@googlegroups.com>\n"
diff --git a/po/ko.po b/po/ko.po
index e2e9df5c..227b519f 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-28 15:14+0000\n"
 "Last-Translator: darehanl <darehanl@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
diff --git a/po/ku.po b/po/ku.po
index 0bd54299..42644134 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:43+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
diff --git a/po/lt.po b/po/lt.po
index 5bd29c07..0e5df421 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-28 20:07+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
diff --git a/po/mk.po b/po/mk.po
index b98bde16..3ca8f9bb 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:43+0000\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
diff --git a/po/ms.po b/po/ms.po
index 7510b364..baba9a1a 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-30 13:49+0000\n"
 "Last-Translator: azlinux <azlinux@gmail.com>\n"
 "Language-Team: Malay <ms@li.org>\n"
diff --git a/po/nb.po b/po/nb.po
index d4ce9cdf..0edbc0c9 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-29 13:06+0000\n"
 "Last-Translator: Hans Petter Birkeland <hanspb@bluezone.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
diff --git a/po/ne.po b/po/ne.po
index 92d0bfd2..cbef83ef 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:43+0000\n"
 "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
diff --git a/po/nl.po b/po/nl.po
index e99d3fb7..9efe0175 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-24 01:32+0000\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
diff --git a/po/no.po b/po/no.po
index 45e77058..1b04ca84 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2005-06-08 23:10+0200\n"
 "Last-Translator: Terance Edward Sola <terance@lyse.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
diff --git a/po/oc.po b/po/oc.po
index c5f21fd3..a2209808 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-29 08:11+0000\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
 "com>\n"
diff --git a/po/pa.po b/po/pa.po
index 45b445c9..3e5fd974 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-04-28 23:31+0000\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n"
diff --git a/po/pl.po b/po/pl.po
index b3a03e01..b37d0d39 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:59+0000\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 2144bab4..1e9fe9db 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-24 10:17+0000\n"
 "Last-Translator: Joao Carvalhinho <latrine@gmail.com>\n"
 "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3ab912a9..cb3c8c2c 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-26 22:31+0000\n"
 "Last-Translator: KurtKraut <ubuntu@kurtkraut.net>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 1e0d1589..e73adf0f 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-24 17:39+0000\n"
 "Last-Translator: Sami POTIRCA <spotirca@gmail.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
diff --git a/po/ru.po b/po/ru.po
index e873db5a..c14af2cf 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-25 19:23+0000\n"
 "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
diff --git a/po/rw.po b/po/rw.po
index 931052ca..abba200e 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:44+0000\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
diff --git a/po/sk.po b/po/sk.po
index acb12569..974215ac 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-24 17:32+0000\n"
 "Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
diff --git a/po/sr.po b/po/sr.po
index f6e75a7b..7a432396 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-27 12:27+0000\n"
 "Last-Translator: Dejan Milosavljevic <dejan@wavebone.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 6c187227..03fe3e20 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:18+0000\n"
 "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/th.po b/po/th.po
index 9cf2d41a..d42d3b0f 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-24 16:44+0000\n"
 "Last-Translator: Roys Hengwatanakul <roysheng@msn.com>\n"
 "Language-Team: Thai <th@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 8ffe6754..e8018237 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:45+0000\n"
 "Last-Translator: Özgur KIRCALI <okircali@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index f996843e..322af381 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:45+0000\n"
 "Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/update-manager.pot b/po/update-manager.pot
index f2e00f38..897a7804 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ur.po b/po/ur.po
index 18ebec55..3464b679 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-19 02:46+0000\n"
 "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
 "Language-Team: Urdu <urd@li.org>\n"
diff --git a/po/urd.po b/po/urd.po
index 27d954c5..18e68cec 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-07 01:53+0000\n"
 "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
 "Language-Team: Urdu <urd@li.org>\n"
diff --git a/po/vi.po b/po/vi.po
index 025b54ed..c03e91e0 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:45+0000\n"
 "Last-Translator: Tran The Trung <tttrung@hotmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
diff --git a/po/xh.po b/po/xh.po
index 86d1c4df..e519731a 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-04-20 19:15+0000\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9f78ebe5..d9e7edab 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-30 14:16+0000\n"
 "Last-Translator: catinsnow <catinsnow@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4322ad56..b89955ac 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-23 19:45+0000\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0400bb12..5d0bb9d7 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 18:12+0200\n"
+"POT-Creation-Date: 2006-07-31 21:12+0200\n"
 "PO-Revision-Date: 2006-05-31 12:00+0000\n"
 "Last-Translator: PCMan <pcman.tw@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n"
diff --git a/software-properties b/software-properties
index 6c38d073..129c3085 100644
--- a/software-properties
+++ b/software-properties
@@ -34,7 +34,7 @@ import sys
 
 from optparse import OptionParser
 
-import SoftwareProperties.aptsources as aptsources
+import UpdateManager.Common.aptsources as aptsources
 
 #sys.path.append("@prefix@/share/update-manager/python")