* merge with mvo

2 files changed, 15 insertions, 15 deletions

diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info
index 4588a9b1..2908e85b 100644
--- a/data/channels/Ubuntu.info
+++ b/data/channels/Ubuntu.info
@@ -8,7 +8,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 CompDescription: Officially supported
-CompDescriptionLong: By Canonical supported Open Source software
+CompDescriptionLong: Canonical supported Open Source software
 Component: universe
 CompDescription: Community maintained
 CompDescriptionLong: Community maintained Open Source software
@@ -17,7 +17,7 @@ CompDescription: Non-free drivers
 CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
 CompDescription: Restricted software
-CompDescriptionLong: By copyright or legal issues restricted software
+CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: edgy
 MatchName: .*
@@ -25,7 +25,7 @@ BaseURI: cdrom:\[Ubuntu.*6.10
 Description: Cdrom with Ubuntu 6.10 'Edgy Eft'
 Available: False
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
@@ -59,7 +59,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 CompDescription: Officially supported
-CompDescriptionLong: By Canonical supported Open Source software
+CompDescriptionLong: Canonical supported Open Source software
 Component: universe
 CompDescription: Community maintained (universe)
 CompDescriptionLong: Community maintained Open Source software
@@ -68,7 +68,7 @@ CompDescription: Non-free drivers
 CompDescriptionLong: Proprietary drivers for devices 
 Component: multiverse
 CompDescription: Restricted software (Multiverse)
-CompDescriptionLong: By copyright or legal issues restricted software
+CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: dapper
 MatchName: .*
@@ -76,7 +76,7 @@ BaseURI: cdrom:\[Ubuntu.*6.06
 Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'
 Available: False
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
@@ -123,7 +123,7 @@ BaseURI: cdrom:\[Ubuntu.*5.10
 Description: Cdrom with Ubuntu 5.10 'Breezy Badger'
 Available: False
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
@@ -151,7 +151,7 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.04 'Hoary Hedgehog'
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 Component: universe
@@ -165,7 +165,7 @@ BaseURI: cdrom:\[Ubuntu.*5.04
 Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'
 Available: False
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
@@ -192,7 +192,7 @@ BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
 Description: Ubuntu 4.10 'Warty Warthog'
 Component: main
-CompDescription: No longer oficially supported
+CompDescription: No longer officially supported
 Component: restricted
 CompDescription: Restricted copyright
 Component: universe
@@ -206,7 +206,7 @@ BaseURI: cdrom:\[Ubuntu.*4.10
 Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
 Available: False
 Component: main
-CompDescription: No longer oficially supported
+CompDescription: No longer officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
index 1afc66c9..f3cce4f7 100644
--- a/data/channels/Ubuntu.info.in
+++ b/data/channels/Ubuntu.info.in
@@ -8,7 +8,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: By Canonical supported Open Source software
+_CompDescriptionLong: Canonical supported Open Source software
 Component: universe
 _CompDescription: Community maintained
 _CompDescriptionLong: Community maintained Open Source software
@@ -17,7 +17,7 @@ _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
 _CompDescription: Restricted software
-_CompDescriptionLong: By copyright or legal issues restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: edgy
 MatchName: .*
@@ -59,7 +59,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: By Canonical supported Open Source software
+_CompDescriptionLong: Canonical supported Open Source software
 Component: universe
 _CompDescription: Community maintained (universe)
 _CompDescriptionLong: Community maintained Open Source software
@@ -68,7 +68,7 @@ _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices 
 Component: multiverse
 _CompDescription: Restricted software (Multiverse)
-_CompDescriptionLong: By copyright or legal issues restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: dapper
 MatchName: .*