From 67565d2a25edd775b0dfdfd36ad205341a717598 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 23 May 2006 16:08:39 +0200
Subject: * don't show codenames but only version numbers (as per  
 https://wiki.ubuntu.com/CodeNamesToVersionNumbers)

---
 SoftwareProperties/aptsources.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'SoftwareProperties')

diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py
index 133e9b3d..bd8ef381 100644
--- a/SoftwareProperties/aptsources.py
+++ b/SoftwareProperties/aptsources.py
@@ -369,29 +369,25 @@ class SourceEntryMatcher:
     # CDs
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.06",
                                          ".*",
-                                         _("CD disk with Ubuntu 6.06 'Dapper "\
-                                           "Drake'"),
+                                         _("CD disk with Ubuntu 6.06 LTS"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10",
                                          ".*",
-                                         _("CD disk with Ubuntu 5.10 'Breezy "\
-                                           "Badger'"),
+                                         _("CD disk with Ubuntu 5.10"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04",
                                          ".*",
-                                         _("CD disk with Ubuntu 5.04 'Hoary "\
-                                           "Hedgehog'"),
+                                         _("CD disk with Ubuntu 5.04"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10",
                                          ".*",
-                                         _("CD disk with Ubuntu 4.10 "\
-                                           "'Warty Warthog'"),
+                                         _("CD disk with Ubuntu 4.10"),
                                          ubuntu_comps, ubuntu_comps_descr))
     # URIs
     # Warty
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^warty$",
-                                         "Ubuntu 4.10 'Warty Warthog'",
+                                         "Ubuntu 4.10",
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
                                          "^warty-security$",
@@ -420,7 +416,7 @@ class SourceEntryMatcher:
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^hoary$",
-                                         "Ubuntu 5.04 'Hoary Hedgehog'",
+                                         "Ubuntu 5.04",
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^hoary-updates$",
@@ -441,7 +437,7 @@ class SourceEntryMatcher:
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^breezy$",
-                                         "Ubuntu 5.10 'Breezy Badger'",
+                                         "Ubuntu 5.10",
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^breezy-backports$",
@@ -454,15 +450,15 @@ class SourceEntryMatcher:
     # dapper
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^dapper-security$",
-                                         _("Ubuntu 6.06 Security Updates"),
+                                         _("Ubuntu 6.06 LTS Security Updates"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
                                          "^dapper-security$",
-                                         _("Ubuntu 6.06 Security Updates"),
+                                         _("Ubuntu 6.06 LTS Security Updates"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^dapper$",
-                                         "Ubuntu 6.06 'Dapper Drake'",
+                                         "Ubuntu 6.06 LTS",
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^dapper-backports$",
-- 
cgit v1.2.3