* merged with glatzor

2 files changed, 34 insertions, 20 deletions

diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info
index 99c202ba..2620a7da 100644
--- a/data/channels/Ubuntu.info
+++ b/data/channels/Ubuntu.info
@@ -8,19 +8,19 @@ Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 Enabled: 1
 CompDescription: Officially supported
-CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main)
+CompDescriptionLong: By Canonical supported Open Source software
 Component: universe
 Enabled: 0
-CompDescription: Community maintained (universe)
-CompDescriptionLong: OpenSource software that is maintained by the community (universe)
+CompDescription: Community maintained
+CompDescriptionLong: Community maintained Open Source software
 Component: restricted
 Enabled: 1
 CompDescription: Non-free drivers
-CompDescriptionLong: Proprietary drivers for devices (restricted) 
+CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
 Enabled: 0
-CompDescription: Restricted software (Multiverse)
-CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse)
+CompDescription: Restricted software
+CompDescriptionLong: By copyright or legal issues restricted software
 
 Suite: edgy
 MatchName: .*
@@ -48,6 +48,13 @@ BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu/
 Description: Recommended updates
 
+Suite: edgy-proposed
+ParentSuite: edgy
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Proposed updates
+
 Suite: edgy-backports
 ParentSuite: edgy
 RepositoryType: deb
@@ -63,19 +70,19 @@ Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 Enabled: 1
 CompDescription: Officially supported
-CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main)
+CompDescriptionLong: By Canonical supported Open Source software
 Component: universe
 Enabled: 0
 CompDescription: Community maintained (universe)
-CompDescriptionLong: OpenSource software that is maintained by the community (universe)
+CompDescriptionLong: Community maintained Open Source software
 Component: restricted
 Enabled: 1
 CompDescription: Non-free drivers
-CompDescriptionLong: Proprietary drivers for devices (restricted) 
+CompDescriptionLong: Proprietary drivers for devices 
 Component: multiverse
 Enabled: 0
 CompDescription: Restricted software (Multiverse)
-CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse)
+CompDescriptionLong: By copyright or legal issues restricted software
 
 Suite: dapper
 MatchName: .*
@@ -103,6 +110,13 @@ BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu/
 Description: Recommended updates
 
+Suite: dapper-proposed
+ParentSuite: dapper
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Proposed updates
+
 Suite: dapper-backports
 ParentSuite: dapper
 RepositoryType: deb
diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
index 4b6b2b19..ed7fd50c 100644
--- a/data/channels/Ubuntu.info.in
+++ b/data/channels/Ubuntu.info.in
@@ -8,19 +8,19 @@ _Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 Enabled: 1
 _CompDescription: Officially supported
-_CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main)
+_CompDescriptionLong: By Canonical supported Open Source software
 Component: universe
 Enabled: 0
-_CompDescription: Community maintained (universe)
-_CompDescriptionLong: OpenSource software that is maintained by the community (universe)
+_CompDescription: Community maintained
+_CompDescriptionLong: Community maintained Open Source software
 Component: restricted
 Enabled: 1
 _CompDescription: Non-free drivers
-_CompDescriptionLong: Proprietary drivers for devices (restricted) 
+_CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
 Enabled: 0
-_CompDescription: Restricted software (Multiverse)
-_CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse)
+_CompDescription: Restricted software
+_CompDescriptionLong: By copyright or legal issues restricted software
 
 Suite: edgy
 MatchName: .*
@@ -70,19 +70,19 @@ _Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 Enabled: 1
 _CompDescription: Officially supported
-_CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main)
+_CompDescriptionLong: By Canonical supported Open Source software
 Component: universe
 Enabled: 0
 _CompDescription: Community maintained (universe)
-_CompDescriptionLong: OpenSource software that is maintained by the community (universe)
+_CompDescriptionLong: Community maintained Open Source software
 Component: restricted
 Enabled: 1
 _CompDescription: Non-free drivers
-_CompDescriptionLong: Proprietary drivers for devices (restricted) 
+_CompDescriptionLong: Proprietary drivers for devices 
 Component: multiverse
 Enabled: 0
 _CompDescription: Restricted software (Multiverse)
-_CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse)
+_CompDescriptionLong: By copyright or legal issues restricted software
 
 Suite: dapper
 MatchName: .*