Index: src/aptsources.py.in
===================================================================
RCS file: /cvs/gnome/update-manager/src/aptsources.py.in,v
retrieving revision 1.7
diff -u -3 -p -r1.7 aptsources.py.in
--- src/aptsources.py.in	13 Apr 2005 14:45:29 -0000	1.7
+++ src/aptsources.py.in	30 Apr 2005 02:11:48 -0000
@@ -245,12 +245,16 @@ class SourceEntryTemplates:
     self.templates.append(SourceEntryTemplate("deb",
                                          "http://security.ubuntu.com/ubuntu/",
                                          "hoary-security",
-                                         _("Ubuntu 5.04 Security Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.04", _("Security Updates")),
                                          ubuntu_comps))
     self.templates.append(SourceEntryTemplate("deb",
                                          "http://archive.ubuntu.com/ubuntu/",
                                          "hoary-updates",
-					 _("Ubuntu 5.04 Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.04", _("Updates")),
                                          ubuntu_comps))
     # breezy ;)
     self.templates.append(SourceEntryTemplate("deb",
@@ -261,12 +265,16 @@ class SourceEntryTemplates:
     self.templates.append(SourceEntryTemplate("deb",
                                          "http://security.ubuntu.com/ubuntu/",
                                          "breezy-security",
-                                         _("Ubuntu 5.10 Security Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.10", _("Security Updates")),
                                          ubuntu_comps))
     self.templates.append(SourceEntryTemplate("deb",
                                          "http://archive.ubuntu.com/ubuntu/",
                                          "breezy-updates",
-                                         _("Ubuntu 5.10 Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.10", _("Updates")),
                                          ubuntu_comps))
                                              
 
@@ -302,15 +310,21 @@ class SourceEntryMatcher:
     # CDs
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10",
                                          ".*",
-                                        _("CD disk with Ubuntu 5.10 \"Breezy Badger\""),
+					 # Note for TRANSLATORS: This shows as "...Ubuntu version codename"
+					 # like "CD disk with Ubuntu 5.10 \"Breezy Badger\""
+					 _("CD disk with Ubuntu %s \"%s\"") % ("5.10", "Breezy Badger"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04",
                                          ".*",
-                                        _("CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""),
+					 # Note for TRANSLATORS: This shows as "...Ubuntu version codename"
+					 # like "CD disk with Ubuntu 5.10 \"Breezy Badger\""
+					 _("CD disk with Ubuntu %s \"%s\"") % ("5.04", "Hoary Hedgehog"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10",
                                          ".*",
-                                        _("CD disk with Ubuntu 4.10 \"Warty Warthog\""),
+					 # Note for TRANSLATORS: This shows as "...Ubuntu version codename"
+					 # like "CD disk with Ubuntu 5.10 \"Breezy Badger\""
+					 _("CD disk with Ubuntu %s \"%s\"") % ("4.10", "Warty Warthog"),
                                          ubuntu_comps, ubuntu_comps_descr))
     # URIs
     # Warty
@@ -333,11 +347,15 @@ class SourceEntryMatcher:
     # Hoary
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^hoary-security$",
-                                         _("Ubuntu 5.04 Security Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.04", _("Security Updates")),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
                                          "^hoary-security$",
-                                         _("Ubuntu 5.04 Security Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.04", _("Security Updates")),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^hoary$",
@@ -345,16 +363,22 @@ class SourceEntryMatcher:
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^hoary-updates$",
-                                         _("Ubuntu 5.04 Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.04", _("Updates")),
                                          ubuntu_comps, ubuntu_comps_descr))
     # Breezy
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^breezy-security$",
-                                         _("Ubuntu 5.10 Security Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.10", _("Security Updates")),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
                                          "^breezy-security$",
-                                         _("Ubuntu 5.10 Security Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.10", _("Security Updates")),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^breezy$",
@@ -362,7 +386,9 @@ class SourceEntryMatcher:
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^breezy-updates$",
-                                         _("Ubuntu 5.10 Updates"),
+					 # Note for TRANSLATORS: This shows as Ubuntu version type
+					 # like "Ubuntu 5.10 Updates"
+                                         _("Ubuntu %s %s") % ("5.10", _("Updates")),
                                          ubuntu_comps, ubuntu_comps_descr))