summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-09-10 12:02:11 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-09-10 12:02:11 +0200
commita021109da0fb1e138adc912c44632f0956243769 (patch)
tree0a066ad2e84e7423932a41f9c9e4df7c10719d2d
parent522d72a3abeacee8b6070481738f9c9edd0a6161 (diff)
downloadpython-apt-a021109da0fb1e138adc912c44632f0956243769.tar.gz
* added new "MirrorsFile" keyword for the DistInfo Tagfile
* look for mirros as well when matching distros
-rw-r--r--TODO2
-rw-r--r--UpdateManager/Common/DistInfo.py11
-rw-r--r--UpdateManager/Common/aptsources.py17
-rw-r--r--data/channels/Ubuntu.info52
-rw-r--r--data/channels/Ubuntu.info.in62
-rw-r--r--debian/changelog9
-rw-r--r--po/ar.po234
-rw-r--r--po/bg.po248
-rw-r--r--po/bn.po235
-rw-r--r--po/br.po234
-rw-r--r--po/ca.po248
-rw-r--r--po/cs.po239
-rw-r--r--po/da.po239
-rw-r--r--po/de.po248
-rw-r--r--po/el.po239
-rw-r--r--po/en_AU.po239
-rw-r--r--po/en_CA.po248
-rw-r--r--po/en_GB.po248
-rw-r--r--po/es.po248
-rw-r--r--po/fi.po248
-rw-r--r--po/fr.po248
-rw-r--r--po/fur.po234
-rw-r--r--po/gl.po248
-rw-r--r--po/he.po248
-rw-r--r--po/hi.po234
-rw-r--r--po/hr.po239
-rw-r--r--po/hu.po239
-rw-r--r--po/id.po239
-rw-r--r--po/it.po248
-rw-r--r--po/ja.po248
-rw-r--r--po/ka.po235
-rw-r--r--po/ko.po239
-rw-r--r--po/ku.po235
-rw-r--r--po/lt.po239
-rw-r--r--po/mk.po248
-rw-r--r--po/ms.po234
-rw-r--r--po/nb.po248
-rw-r--r--po/ne.po248
-rw-r--r--po/nl.po239
-rw-r--r--po/no.po248
-rw-r--r--po/oc.po235
-rw-r--r--po/pa.po234
-rw-r--r--po/pl.po248
-rw-r--r--po/pt.po239
-rw-r--r--po/pt_BR.po248
-rw-r--r--po/ro.po248
-rw-r--r--po/ru.po239
-rw-r--r--po/rw.po242
-rw-r--r--po/sk.po248
-rw-r--r--po/sr.po234
-rw-r--r--po/sv.po251
-rw-r--r--po/th.po239
-rw-r--r--po/tr.po235
-rw-r--r--po/uk.po248
-rw-r--r--po/update-manager.pot234
-rw-r--r--po/ur.po234
-rw-r--r--po/urd.po234
-rw-r--r--po/vi.po248
-rw-r--r--po/xh.po234
-rw-r--r--po/zh_CN.po248
-rw-r--r--po/zh_HK.po248
-rw-r--r--po/zh_TW.po239
-rw-r--r--tests/data/sources.list.testDistribution4
-rw-r--r--tests/test_aptsources.py13
64 files changed, 7498 insertions, 6212 deletions
diff --git a/TODO b/TODO
index 72acb345..588e7a8a 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,8 @@ UpdateManager.Common.aptsources.py:
- make the distro detection in sources.list more clever by using the
origin informaton to avoid adding full uris to (unofficial/internal)
mirrors
+- make it possible to inherit the mirrros from a ParentSuite (for
+ the childs)
Misc:
- have a common error dialog readymade and rib out all those
diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py
index 79d5356c..81f08200 100644
--- a/UpdateManager/Common/DistInfo.py
+++ b/UpdateManager/Common/DistInfo.py
@@ -24,6 +24,7 @@ import os
import gettext
from os import getenv
import ConfigParser
+import string
_ = gettext.gettext
@@ -38,6 +39,7 @@ class Suite:
self.components = {}
self.children = []
self.match_uri = None
+ self.valid_mirrors = []
self.distribution = None
self.available = True
@@ -107,6 +109,12 @@ class DistInfo:
suite.match_uri = value
elif field == 'MatchURI':
suite.match_uri = value
+ elif field == 'MirrorsFile':
+ suite.valid_mirrors = filter(lambda s:
+ ((s != "") and
+ (not s.startswith("#"))),
+ map(string.strip,
+ open(value)))
elif field == 'Description':
suite.description = _(value)
elif field == 'Component':
@@ -133,13 +141,14 @@ class DistInfo:
if __name__ == "__main__":
- d = DistInfo ("Ubuntu", "../../channels")
+ d = DistInfo ("Ubuntu", "../../data/channels")
print d.changelogs_uri
for suite in d.suites:
print "\nSuite: %s" % suite.name
print "Desc: %s" % suite.description
print "BaseURI: %s" % suite.base_uri
print "MatchURI: %s" % suite.match_uri
+ print "Mirrors: %s" % suite.valid_mirrors
for component in suite.components:
print " %s - %s - %s - %s" % (component,
suite.components[component][0],
diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py
index 36a9811d..bc6886d9 100644
--- a/UpdateManager/Common/aptsources.py
+++ b/UpdateManager/Common/aptsources.py
@@ -87,7 +87,8 @@ class SourceEntry:
file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist")
self.file = file # the file that the entry is located in
self.parse(line)
- self.template = None
+ # FIXME: this name is really misleading and already overloaded
+ self.template = None # type DistInfo.Suite
self.children = []
def __eq__(self, other):
@@ -457,12 +458,17 @@ class SourceEntryMatcher:
_ = gettext.gettext
found = False
for template in self.templates:
- #print "'%s'" %source.uri
- if re.search(template.match_uri, source.uri) and \
- re.match(template.match_name, source.dist):
+ if (re.search(template.match_uri, source.uri) and
+ re.match(template.match_name, source.dist)):
found = True
source.template = template
break
+ for mirror in template.valid_mirrors:
+ if (is_mirror(mirror,source.uri) and
+ re.match(template.match_name, source.dist)):
+ found = True
+ source.template = template
+ break
return found
class Distribution:
@@ -717,3 +723,6 @@ if __name__ == "__main__":
print is_mirror("http://archive.ubuntu.com/ubuntu",
"http://de.archive.ubuntu.com/ubuntu/")
+ print is_mirror("http://archive.ubuntu.com/ubuntu/",
+ "http://de.archive.ubuntu.com/ubuntu")
+
diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info
index 2620a7da..93ec83d2 100644
--- a/data/channels/Ubuntu.info
+++ b/data/channels/Ubuntu.info
@@ -3,7 +3,8 @@ ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/change
Suite: edgy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
Description: Ubuntu 6.10 'Edgy Eft'
Component: main
Enabled: 1
@@ -38,34 +39,35 @@ Suite: edgy-security
ParentSuite: edgy
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
Description: Important security updates
Suite: edgy-updates
ParentSuite: edgy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: 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/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Proposed updates
Suite: edgy-backports
ParentSuite: edgy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Backported updates
Suite: dapper
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
Description: Ubuntu 6.06 LTS 'Dapper Drake'
Component: main
Enabled: 1
@@ -100,34 +102,35 @@ Suite: dapper-security
ParentSuite: dapper
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
Description: Important security updates
Suite: dapper-updates
ParentSuite: dapper
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: 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/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Proposed updates
Suite: dapper-backports
ParentSuite: dapper
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Backported updates
Suite: breezy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
Description: Ubuntu 5.10 'Breezy Badger'
Component: main
Enabled: 1
@@ -158,27 +161,28 @@ Suite: breezy-security
ParentSuite: breezy
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
Description: Ubuntu 5.10 Security Updates
Suite: breezy-updates
ParentSuite: breezy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Ubuntu 5.10 Updates
Suite: breezy-backports
ParentSuite: breezy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Ubuntu 5.10 Backports
Suite: hoary
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
Description: Ubuntu 5.04 'Hoary Hedgehog'
Component: main
Enabled: 1
@@ -209,31 +213,31 @@ Suite: hoary-security
ParentSuite: hoary
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
Description: Ubuntu 5.04 Security Updates
Suite: hoary-updates
ParentSuite: hoary
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Ubuntu 5.04 Updates
Suite: hoary-backports
ParentSuite: hoary
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Ubuntu 5.04 Backports
Suite: warty
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Ubuntu 4.10 'Warty Warthog'
Component: main
Enabled: 1
-CompDescription: Oficially supported
+CompDescription: No longer oficially supported
Component: restricted
Enabled: 1
CompDescription: Restricted copyright
@@ -251,7 +255,7 @@ Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
Available: False
Component: main
Enabled: 1
-CompDescription: Oficially supported
+CompDescription: No longer oficially supported
Component: restricted
Enabled: 1
CompDescription: Restricted copyright
@@ -260,19 +264,19 @@ Suite: warty-security
ParentSuite: warty
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com
Description: Ubuntu 4.10 Security Updates
Suite: warty-updates
ParentSuite: warty
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Ubuntu 4.10 Updates
Suite: warty-backports
ParentSuite: warty
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
Description: Ubuntu 4.10 Backports
diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
index ed7fd50c..2b20cf8f 100644
--- a/data/channels/Ubuntu.info.in
+++ b/data/channels/Ubuntu.info.in
@@ -3,7 +3,8 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang
Suite: edgy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 6.10 'Edgy Eft'
Component: main
Enabled: 1
@@ -38,34 +39,39 @@ Suite: edgy-security
ParentSuite: edgy
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Important security updates
Suite: edgy-updates
ParentSuite: edgy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Recommended updates
Suite: edgy-proposed
ParentSuite: edgy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Proposed updates
Suite: edgy-backports
ParentSuite: edgy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Backported updates
Suite: dapper
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 6.06 LTS 'Dapper Drake'
Component: main
Enabled: 1
@@ -100,34 +106,39 @@ Suite: dapper-security
ParentSuite: dapper
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Important security updates
Suite: dapper-updates
ParentSuite: dapper
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Recommended updates
Suite: dapper-proposed
ParentSuite: dapper
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Proposed updates
Suite: dapper-backports
ParentSuite: dapper
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Backported updates
Suite: breezy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 5.10 'Breezy Badger'
Component: main
Enabled: 1
@@ -158,27 +169,31 @@ Suite: breezy-security
ParentSuite: breezy
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 5.10 Security Updates
Suite: breezy-updates
ParentSuite: breezy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 5.10 Updates
Suite: breezy-backports
ParentSuite: breezy
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 5.10 Backports
Suite: hoary
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 5.04 'Hoary Hedgehog'
Component: main
Enabled: 1
@@ -209,27 +224,30 @@ Suite: hoary-security
ParentSuite: hoary
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 5.04 Security Updates
Suite: hoary-updates
ParentSuite: hoary
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 5.04 Updates
Suite: hoary-backports
ParentSuite: hoary
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
+MirrorsFile: /usr/share/update-manager/mirrors.cfg
_Description: Ubuntu 5.04 Backports
Suite: warty
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
_Description: Ubuntu 4.10 'Warty Warthog'
Component: main
Enabled: 1
@@ -260,19 +278,19 @@ Suite: warty-security
ParentSuite: warty
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com
_Description: Ubuntu 4.10 Security Updates
Suite: warty-updates
ParentSuite: warty
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
_Description: Ubuntu 4.10 Updates
Suite: warty-backports
ParentSuite: warty
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu
_Description: Ubuntu 4.10 Backports
diff --git a/debian/changelog b/debian/changelog
index 230fd67f..d83e1323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+update-manager (0.44.10) edgy; urgency=low
+
+ * aptsources.py:
+ - fix add_component() to avoid duplicated components
+ - added MirrorsFile key to DistInfo code to have a better idea
+ about the available mirrors
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Sun, 10 Sep 2006 00:01:29 +0200
+
update-manager (0.44.9) edgy; urgency=low
* SoftwareProperties/SoftwareProperties.py:
diff --git a/po/ar.po b/po/ar.po
index 63d4fa85..5a87efcd 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,108 +17,116 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n == 2 ? 1 : 2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "يوميا"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "كل يومين"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "اسبوعي"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "كل اسبوعين"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "كل %s يوم"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "بعد اسبوع"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "بعد اسبوعين"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "بعد شهر"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "بعد %s يوم"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "خطاء في استيراد الملف"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "خطاء في ازالة المفتاح"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -126,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "الرجاء ادخال اسم القرص"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "الرجاء ادخال القرص في الجهاز"
@@ -759,110 +767,110 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -870,52 +878,52 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1233,183 +1241,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index e41fb871..d81f750b 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,113 +17,121 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Ежедневно"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Всеки два дни"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Ежеседмично"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Всеки две седмици"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Всеки %s дни"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "След една седмица"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "След две седмици"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "След един месец"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "След %s дни"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Инсталиране на актуализациите"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Обновления на софтуера"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Изходен код"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Изходен код"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Внасяне на ключ"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Грешка при внасяне на избрания файл"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Избраният файл или не е GPG файл, или е повреден."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Грешка при премахване на ключа"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Ключът, който сте избрали, не може да бъде премахнат. Докладвайте това като "
"грешка."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -134,11 +142,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Моля, въведете име за диска"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Моля, поставете диск в устройството:"
@@ -843,16 +851,16 @@ msgstr "Сваляне на файл %li от %li при %s/сек"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Сваляне на файл %li от %li при неизвестна скорост"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -860,134 +868,134 @@ msgstr ""
"Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет "
"връзката си."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 актуализации на сигурността"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Надграждане до последната версия на Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Инсталиране на актуализациите"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Не могат да бъдат инсталирани всички актуализации"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Версия %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Сваляне на списъка с промени..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Размер за изтегляне: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Системата Ви е актуална"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Можете да инсталирате %s актуализация"
msgstr[1] "Можете да инсталирате %s актуализации"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Моля, изчакайте! Това може да отнеме известно време."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Актуализацията е завършена"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Нова версия: %s (Размер: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Версия %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Вашата дистрибуция вече не се поддържа"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -997,17 +1005,17 @@ msgstr ""
"Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com "
"за повече информация за надграждането!"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Индексът на софтуера е повреден"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1372,202 +1380,220 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 актуализации"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Поддържани от обществото (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Допринесен софтуер"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Поддържани от обществото (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Поддържани от обществото (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Несвободни (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Несвободни (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Ограничен за изнасяне от САЩ софтуер"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 актуализации на сигурността"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Инсталиране на актуализациите"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Официално поддържани"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 актуализации на сигурността"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 актуализации"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Състарени версии"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Официално поддържан"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 актуализации на сигурността"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 актуализации"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Състарени версии"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Поддържани от обществото (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Несвободни (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Официално поддържан"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Ограничени авторски права"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 обновления по сигурността"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 4.10 обновления"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Състарени версии"
@@ -1861,15 +1887,9 @@ msgstr "Софтуер несъвместим с DFSG"
#~ msgid "Binary"
#~ msgstr "Двоични"
-#~ msgid "Contributed software"
-#~ msgstr "Допринесен софтуер"
-
#~ msgid "Non-free software"
#~ msgstr "Несвободен софтуер"
-#~ msgid "US export restricted software"
-#~ msgstr "Ограничен за изнасяне от САЩ софтуер"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 „Woody“"
diff --git a/po/bn.po b/po/bn.po
index eb93ec84..110eeb8c 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,109 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "দৈনিক"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "প্রত্যেক দুই দিনে"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "সাপ্তাহিক"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "প্রত্যেক দুই সপ্তাহে"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "প্রত্যেক %s দিনে"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "এক সপ্তাহ পর"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "দুই সপ্তাহ পর"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "এক মাস পর"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s দিন পর"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "আপডেট ইন্সটল করো (_I)"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "সফ্টওয়্যার আপডেট"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "কী ইম্পোর্ট"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "নির্বাচিত ফাইলটি ইম্পোর্ট করতে সমস্যা হয়েছে"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "বেছে নেয়া ফাইলটি মনে হয় কোন GPG কী ফাইল নয় অথবা এটি নষ্ট।"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "কী সরাতে সমস্যা হয়েছে"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -130,11 +138,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "ডিস্কের জন্য একটি নাম দিন"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:"
@@ -784,16 +792,16 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -801,151 +809,151 @@ msgid ""
msgstr ""
"পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "আপডেট ইন্সটল করো (_I)"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "ভার্সন %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "ডাউনলোড এর আকার: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "আপনার সিস্টেম আপ-টু-ডেট"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন"
msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।"
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "আপডেট সম্পন্ন"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "নতুন ভার্সন: %s (আকার: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "ভার্সন %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1272,200 +1280,215 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "উবুন্টু ৫.১০ আপডেট"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "ফ্রি নয় (মাল্টিভার্স)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "ফ্রি নয় (মাল্টিভার্স)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "ফ্রি নয় (মাল্টিভার্স)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "আপডেট ইন্সটল করো (_I)"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "অফিসিয়াল ভাবে সমর্থিত"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "উবুন্টু ৫.১০ আপডেট"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "অফিসিয়াল ভাবে সমর্থিত"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "উবুন্টু ৫.১০ আপডেট"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "ফ্রি নয় (মাল্টিভার্স)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "উবুন্টু ৫.১০ আপডেট"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
diff --git a/po/br.po b/po/br.po
index 29126b80..644917da 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,112 +17,120 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Bep %s devezh"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "War-lerc'h %s devezh"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Emborzhiañ an alc'hwezh"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Fazi en ur emborzhiañ ar restr dibabet"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Moarvat n'eo ket ur restr alc'hwezh GPG ar restr dibabet, pe neuze eo "
"gwastet."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Fazi en ur zilemel an alc'hwezh"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"N'eus ket tu da zilemel an alc'whezh ho peus dibabet. Kelaouit eo ur bug "
"marplij."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -130,11 +138,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Roit un anv evit ar bladenn marplij"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Lakait ur bladenn e-barzh ul lenner marplij:"
@@ -760,162 +768,162 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1234,183 +1242,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 74ac19db..cb40bdb5 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,115 +16,123 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Diàriament"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Cada dos dies"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Setmanalment"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Cada dues setmanes"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Cada %s dies"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Després d'una setmana"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Després de dues setmanes"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Després d'un mes"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Després de %s dies"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Instal·la les actualitzacions"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Actualitzacions de programari"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Font"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Font"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importa un clau"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "S'ha produït un error en importar el fitxer seleccionat"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"El fitxer que heu seleccionat no correspon a una clau GPG o pot estar "
"corromput."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "S'ha produït un error en esborrar la clau"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"La clau que heu seleccionat no es pot esborrar. Notifiqueu-ho com a error de "
"programació."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -135,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Introduïu un nom per al disc"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Inseriu un disc a la unitat:"
@@ -821,16 +829,16 @@ msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -838,134 +846,134 @@ msgstr ""
"S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió "
"a Internet."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Debian Stable Security Updates"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Actualitza a la darrera versió d'Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Instal·la les actualitzacions"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "No es poden instal·lar les actualitzacions disponibles"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versió %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "S'està descarregant la llista de canvis..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Mida de la descàrrega: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "El vostre sistema està actualitzat"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Podeu instal·lar %s actualització"
msgstr[1] "Podeu instal·lar %s actualitzacions"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Espereu, això pot tardar una estona."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "S'ha completat l'actualització"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Versió nova: %s (Mida: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versió %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "La vostra distribució ja no es mantindrà més"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -975,17 +983,17 @@ msgstr ""
"sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més "
"informació."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Ja disposeu de la nova distribució '%s'</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "L'índex de programari s'ha trencat"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1343,201 +1351,219 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Actualitzacions d'Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Paquets mantinguts per la comunitat (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Programari de la comunitat"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Paquets mantinguts per la comunitat (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Paquets mantinguts per la comunitat (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Paquets sense llicència lliure (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Paquets sense llicència lliure (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Programari amb restriccions d'exportació als EUA"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Debian Stable Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Instal·la les actualitzacions"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Paquets mantinguts oficialment (Main)"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Actualitzacions de seguretat d'Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Actualitzacions d'Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Paquets mantinguts oficialment (Main)"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr "Actualitzacions d'Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Paquets mantinguts per la comunitat (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Paquets sense llicència lliure (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Algun programari ja no es mantindrà oficialment"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Paquets amb restriccions per copyright (Restricted)"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Actualitzacions de seguretat d'Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Actualitzacions d'Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
@@ -1850,15 +1876,9 @@ msgstr "Programari no compatible DFSG"
#~ msgid "Binary"
#~ msgstr "Binari"
-#~ msgid "Contributed software"
-#~ msgstr "Programari de la comunitat"
-
#~ msgid "Non-free software"
#~ msgstr "Programari sense llicència lliure"
-#~ msgid "US export restricted software"
-#~ msgstr "Programari amb restriccions d'exportació als EUA"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 \"Woody\""
diff --git a/po/cs.po b/po/cs.po
index 16cb7f59..a2efb624 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -18,109 +18,117 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Denně"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Obden"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Týdně"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Každé dva týdny"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Každých %s dní"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Po týdnu"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Po dvou týdnech"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Po měsíci"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Po %s dnech"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Instaluji aktualizace"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Aktualizace softwaru"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importovat klíč"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Chyba při importování vybraného souboru"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Vybraný soubor nemusí obsahovat GPG klíč nebo může být porušen."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Chyba při odstraňování klíče"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Vybraný klíč nemohl být odstraněn. Prosím oznamte to jako chybu."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Prosím zadejte jméno disku"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Prosím vložte disk do mechaniky:"
@@ -814,115 +822,115 @@ msgstr "Stahuji %li. soubor z %li rychlostí %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Stahuji %li. soubor z %li neznámou rychlostí"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
"Selhalo stažení seznamu změn. Prosím zkontrolujte své internetové připojení."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Upgradovat na poslední verzi Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Instaluji aktualizace"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Nelze nainstalovat všechny dostupné aktualizace"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Verze %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Stahuji seznam změn ..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Stahovaná velikost: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Váš systém je aktuální"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -930,35 +938,35 @@ msgstr[0] "Můžete instalovat %s aktualizaci"
msgstr[1] "Můžete instalovat %s aktualizace"
msgstr[2] "Můžete instalovat %s aktualizací"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Prosím čekejte, může to nějakou dobu trvat."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Aktualizace je dokončena"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nová verze: %s (Velikost: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Verze %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Vaše distribude už není podporovaná"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -968,17 +976,17 @@ msgstr ""
"Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na "
"vyšší verzi se podívejte na http://www.ubuntu.com."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1335,200 +1343,217 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Aktualizace"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Udržováno komunitou (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Nesvobodný (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Udržováno komunitou (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Udržováno komunitou (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Nesvobodný (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Nesvobodný (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Instaluji aktualizace"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Oficiálně podporováno"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Aktualizace"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Oficiálně podporované"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Aktualizace"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Udržováno komunitou (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Nesvobodný (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Oficiálně podporované"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Omezeno copyrightem"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 Aktualizace"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Backports"
diff --git a/po/da.po b/po/da.po
index 1d9e6336..a8005f20 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,110 +17,118 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Dagligt"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Hver 2. dag"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Ugentligt"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Hver 2. uge"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, fuzzy, python-format
msgid "Every %s days"
msgstr "Hver %s. dag"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Efter 1 uge"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Efter 2 uger"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Efter 1 måned"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Efter %s dag(e)"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Installer Opdateringer"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Opdateringer"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importér nøgle"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Fejl under importering af den valgte fil"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Den valgte fil er ikke en GPG-nøglefil eller den er i stykker."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Fejl ved fjernelse af nøgle"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Den valgte nøgle kunne ikke fjernes. Rapporter venligst dette som en fejl."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Indtast venligst et navn til disken"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Indsæt venligst en disk i drevet:"
@@ -829,16 +837,16 @@ msgstr "Henter fil %li af %li med %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Henter fil %li af %li med ukendt hastighed"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -847,134 +855,134 @@ msgstr ""
"Fejl ved hentning af ændringslisten. Undersøg venligst din "
"internetforbindelse."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Opgrader til seneste version af Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Installer Opdateringer"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Kan ikke installere alle tilgængelige opdateringer"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Henter listen med ændringer..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Overføringsstørelse: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Dit system er opdateret"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Du kan installere %s opdatering"
msgstr[1] "Du kan installere %s opdateringer"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Vent venligst, dette kan tage et stykke tid."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Opdatering udført"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Ny version: %s (Size: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Din distribution understøtes ikke længere"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -984,17 +992,17 @@ msgstr ""
"opdateringer. Opgrader til en senere version af Ubuntu Linux. Se http://www."
"ubuntu.com (engalsk) for mere informaiton om opgradering."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Software indexet er i stykker"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1363,204 +1371,221 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Opdateringer"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Vedligeholdt af fællesskabet (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Ikke frit programmel (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Vedligeholdt af fællesskabet (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Vedligeholdt af fællesskabet (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Ikke frit programmel (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Ikke frit programmel (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Installer Opdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "Officielt understøttet"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Opdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Officielt understøttet"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Opdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Vedligeholdt af fællesskabet (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Ikke frit programmel (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Noget software er ikke længere officielt understøttet"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
#, fuzzy
msgid "Restricted copyright"
msgstr "Begrænset copyright"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 Opdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Backports"
diff --git a/po/de.po b/po/de.po
index bb01bd71..e679473a 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -18,115 +18,123 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Täglich"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Alle zwei Tage"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Wöchentlich"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Alle zwei Wochen"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Alle %s Tage"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Nach einer Woche"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Nach zwei Wochen"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Nach einem Monat"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Nach %s Tagen"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Aktualisierungen werden installiert"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Software-Aktualisierungen"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Quellen"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Quellen"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Schlüssel importieren"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Fehler beim Importieren der gewählten Datei"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Die ausgewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder "
"beschädigt."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Fehler beim Entfernen des Schlüssels"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Der ausgewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
"hierfür einen Fehlerbericht."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -137,11 +145,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Geben Sie einen Namen für das Medium ein"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Bitte legen Sie ein Medium in das Laufwerk:"
@@ -863,20 +871,20 @@ msgstr "Datei %li von %li wird mit %s/s heruntergeladen"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen "
"Sie es zu einem späteren Zeitpunkt erneut."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen "
"Sie es zu einem späteren Zeitpunkt erneut."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -884,134 +892,134 @@ msgstr ""
"Die Liste mit Änderungen konnte nicht heruntergeladen werden. Bitte "
"überprüfen Sie Ihre Internet-Verbindung."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Aus die neueste Version von Ubuntu aktualisieren"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Aktualisierungen werden installiert"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Liste mit Änderungen wird heruntergeladen..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Download-Größe: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Ihr System ist auf dem aktuellen Stand"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Sie können %s Aktualisierung installieren"
msgstr[1] "Sie können %s Aktualisierungen installieren"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Aktualisierung ist abgeschlossen"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Neue Version: %s (Größe: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Ihre Distribution wird nicht länger unterstützt"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1022,17 +1030,17 @@ msgstr ""
"System auf eine neuere Version von Ubuntu Linux. Auf http://www.ubuntuusers."
"de oder http://www.ubuntu.com finden Sie weitere Informationen hierzu."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Neue Version '%s' der Distribution ist freigegeben</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Der Software-Index ist beschädigt"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1400,200 +1408,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Aktualisierungen"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Von der Gemeinschaft betreut (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Contributed Software"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Von der Gemeinschaft betreut (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Von der Gemeinschaft betreut (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Unfrei (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Unfrei (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Software mit US-Exportbeschränkungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Aktualisierungen werden installiert"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Offiziell unterstützt"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Aktualisierungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Offiziell unterstützt"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Aktualisierungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Von der Gemeinschaft betreut (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Unfrei (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Urheberrechtlich eingeschränkt"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 Aktualisierungen"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Backports"
@@ -2036,15 +2062,9 @@ msgstr "Nicht DFSG-kompatible Software"
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Contributed Software"
-
#~ msgid "Non-free software"
#~ msgstr "Unfreie Software"
-#~ msgid "US export restricted software"
-#~ msgstr "Software mit US-Exportbeschränkungen"
-
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr ""
#~ "Automatischer Signaturschlüssel des Ubuntu-Archivs <ftpmaster@ubuntu.com>"
diff --git a/po/el.po b/po/el.po
index 69ee6eb5..2d55ab71 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,112 +16,120 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Ημερησίως"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Κάθε δύο ημέρες"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Εβδομαδιαίως"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Κάθε δύο εβδομάδες"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Κάθε %s ημέρες"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Μετά από μια εβδομάδα"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Μετά από δύο εβδομάδες"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Μετά από ένα μήνα"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Μετά από %s ημέρες"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Εγκατάσταση ενημερώσεων"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr "Κανάλι λογισμικού"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr "Ενεργό"
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Εισαγωγή κλειδιού"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να "
"είναι κατεστραμμένο."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Σφάλμα απομάκρυνσης του κλειδιού"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως "
"σφάλμα."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -132,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:"
@@ -849,18 +857,18 @@ msgstr "Λήψη αρχείου %li από %li με %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -868,134 +876,134 @@ msgstr ""
"Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας στο "
"διαδίκτυο."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Εγκατάσταση ενημερώσεων"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Έκδοση%s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Λήψη της λίστας των αλλαγών..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Μέγεθος λήψης: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Το σύστημα σας είναι ενημερωμένο"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση"
msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Η ενημέρωση ολοκληρώθηκε"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Νέα έκδοση: %s (Μέγεθος: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Έκδοση%s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Η διανομή σας δεν υποστηρίζεται πια"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1006,17 +1014,17 @@ msgstr ""
"Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες "
"για την αναβάθμιση."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Είναι διαθέσιμη νέα έκδοση διανομής '%s'</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1378,200 +1386,217 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Αναβαθμίσεις Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Community maintained (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Όχι-ελεύθερα (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Community maintained (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Community maintained (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Όχι-ελεύθερα (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Όχι-ελεύθερα (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Εγκατάσταση ενημερώσεων"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Με επίσημη υποστήριξη"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Αναβαθμίσεις Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Oficially supported"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Αναβαθμίσεις Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Community maintained (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Όχι-ελεύθερα (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Περιορισμένα πνευματικά δικαιώματα"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Αναβαθμίσεις Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Backports"
diff --git a/po/en_AU.po b/po/en_AU.po
index 2bcde566..9d153fcb 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,110 +17,118 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Daily"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Every two days"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Weekly"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Every two weeks"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Every %s days"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "After one week"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "After two weeks"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "After one month"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "After %s days"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Install Updates"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Software Updates"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Import key"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Error importing selected file"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "The selected file may not be a GPG key file or it might be corrupt."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Error removing the key"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"The key you selected could not be removed. Please report this as a bug."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Please enter a name for the disc"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Please insert a disc in the drive:"
@@ -840,16 +848,16 @@ msgstr "Downloading file %li of %li with %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Downloading file %li of %li with unknown speed"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "The list of changes is not available yet. Please try again later."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "The list of changes is not available yet. Please try again later."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -857,134 +865,134 @@ msgstr ""
"Failed to download the list of changes. Please check your Internet "
"connection."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Security Updates"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Upgrade to the latest version of Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Install Updates"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Cannot install all available updates"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Downloading the list of changes..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Download size: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Your system is up-to-date"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "You can install %s update"
msgstr[1] "You can install %s updates"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Please wait, this can take some time."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Update is complete"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "New version: %s (Size: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Your distribution is not supported anymore"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -994,17 +1002,17 @@ msgstr ""
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>New distribution release '%s' is available</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Software index is broken"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1369,201 +1377,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Updates"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Community maintained (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Non-free (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Community maintained (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Community maintained (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Install Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Officially supported"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Officially supported"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Community maintained (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Non-free (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Some software no longer officially supported"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Restricted copyright"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Backports"
diff --git a/po/en_CA.po b/po/en_CA.po
index f71ff780..decd0e07 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,113 +17,121 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>Details</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Install"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Software Updates"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Error importing selected file"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "The selected file may not be a GPG key file or it might be corrupt."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Error removing the key"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"The key you selected could not be removed. Please report this as a bug."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -777,16 +785,16 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "There is a new release of Ubuntu available!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -795,153 +803,153 @@ msgstr ""
"Failed to download changes. Please check if there is an active internet "
"connection."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.04 Security Updates"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Install"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Cancel downloading the ChangeLog"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Your system is up-to-date!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Installing updates..."
msgstr[1] "Installing updates..."
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Your distribution is no longer supported"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1284,206 +1292,224 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.04 Updates"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Community maintained (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Contributed software"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 5.04 Security Updates"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Community maintained (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Community maintained (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "US export restricted software"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Install"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.04 Security Updates"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "Officially supported"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
#, fuzzy
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
#, fuzzy
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.04 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.04 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 Security Updates"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Officially supported"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.04 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.04 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.04 Security Updates"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Community maintained (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Non-free (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Officially supported"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Restricted copyright"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.04 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.04 Updates"
@@ -1824,15 +1850,9 @@ msgstr ""
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Contributed software"
-
#~ msgid "Non-free software"
#~ msgstr "Non-free software"
-#~ msgid "US export restricted software"
-#~ msgstr "US export restricted software"
-
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
diff --git a/po/en_GB.po b/po/en_GB.po
index 370e696e..d0bab3cc 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+0200\n"
"PO-Revision-Date: 2006-05-23 19:41+0000\n"
"Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
"Language-Team: \n"
@@ -16,113 +16,121 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>Details</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Installing updates..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Software Updates"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Error importing selected file"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "The selected file may not be a GPG key file or it might be corrupt."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Error removing the key"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"The key you selected could not be removed. Please report this as a bug."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -130,11 +138,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -776,16 +784,16 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "There is a new release of Ubuntu available!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -794,153 +802,153 @@ msgstr ""
"Failed to download changes. Please check if there is an active internet "
"connection."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Security Updates"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Installing updates..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Downloading Changes"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Your system is up-to-date!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Installing updates..."
msgstr[1] "Installing updates..."
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Your distribution is no longer supported"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1284,205 +1292,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Updates"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Community maintained (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Contributed software"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 5.04 Updates"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Community maintained (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Community maintained (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "US export restricted software"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 5.04 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Installing updates..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "Officially supported"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Officially supported"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Community maintained (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Non-free (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Officially supported"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Restricted copyright"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 4.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Updates"
@@ -1769,15 +1795,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "Binary"
-#~ msgid "Contributed software"
-#~ msgstr "Contributed software"
-
#~ msgid "Non-free software"
#~ msgstr "Non-free software"
-#~ msgid "US export restricted software"
-#~ msgstr "US export restricted software"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 \"Woody\""
diff --git a/po/es.po b/po/es.po
index 5af5554c..46295b1c 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -19,115 +19,123 @@ msgstr ""
"X-Generator: KBabel 1.10\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Una vez al día"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Cada dos días"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Una vez a la semana"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Cada dos semanas"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Cada %s días"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Después de una semana"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Después de dos semanas"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Después de un mes"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Después de %s días"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Instalando actualizaciones"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Actualizaciones de software"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Fuente"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Fuente"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importar clave"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Hubo un error al importar el archivo seleccionado"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Puede que el archivo seleccionado no sea un archivo de clave GPG o que esté "
"corrupto."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Hubo un error al quitar la clave"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
"como un fallo."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -138,11 +146,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Por favor, introduzca un nombre para el disco"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Por favor, inserte un disco en la unidad:"
@@ -860,20 +868,20 @@ msgstr "Descargando archivo %li de %li a %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Descargando archivo %li de %li a velocidad desconocida"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo "
"más tarde."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo "
"más tarde."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -881,134 +889,134 @@ msgstr ""
"Hubo un fallo al descargar la lista de cambios. Por favor, compruebe su "
"conexión a Internet."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Actualizar a la última versión de Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Instalando actualizaciones"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "No se han podido instalar todas las actualizaciones disponibles"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versión %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Descargando la lista de cambios..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Tamaño de descarga: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Su sistema está actualizado"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Puede instalar %s actualización"
msgstr[1] "Puede instalar %s actualizaciones"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Por favor, espere; esto puede tardar un poco."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "La actualización se ha completado"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nueva versión: %s (Tamaño: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versión %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Su distribución ya no está soportada"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1018,17 +1026,17 @@ msgstr ""
"críticas. Actualícese a una versión posterior de Ubuntu Linux. Visite http://"
"www.ubuntu.com para más información sobre la actualización."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Está disponible la nueva versión «%s» de la distribución</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "El índice de software está dañado"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1394,200 +1402,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Actualizaciones de Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Mantenido por la comunidad (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Software contribuido"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 «Dapper Drake»"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Mantenido por la comunidad (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Mantenido por la comunidad (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Software no libre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Software no libre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Software con restricciones de exportación estadounidenses"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 «Dapper Drake»"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Instalando actualizaciones"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 «Breezy Badger»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Soportado oficialmente"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 «Breezy Badger»"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Actualizaciones de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "«Backports» de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Soportado oficialmente"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Actualizaciones de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "«Backports» de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 «Breezy Badger»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Mantenido por la comunidad (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Software no libre (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Algunos programas ya no están soportados oficialmente"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Copyright restringido"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 Actualizaciones de seguridad"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Actualizaciones de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "«Backports» de Ubuntu 5.10"
@@ -1975,15 +2001,9 @@ msgstr "Software no compatible con la DFSG"
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Software contribuido"
-
#~ msgid "Non-free software"
#~ msgstr "Software no libre"
-#~ msgid "US export restricted software"
-#~ msgstr "Software con restricciones de exportación estadounidenses"
-
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr ""
#~ "Clave de firmado automático del archivo de Ubuntu <ftpmaster@ubuntu.com>"
diff --git a/po/fi.po b/po/fi.po
index 2c1b01ac..959956f5 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,113 +16,121 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Päivittäin"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Joka toinen päivä"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Viikottain"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Joka toinen viikko"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "%s päivän välein"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Viikon jälkeen"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Kahden viikon jälkeen"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Kuukauden jälkeen"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s päivän jälkeen"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Asennetaan päivityksiä"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr "Ohjelmistokanava"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr "Aktiivinen"
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Lähdekoodi"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Lähdekoodi"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Tuo avain"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Virhe tuotaessa valittua avainta"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Valittu tiedosto ei ole kelvollinen GPG-avaintiedosto, tai se on "
"vahingoittunut."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Virhe poistettaessa avainta"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -133,11 +141,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Syötä nimi levylle"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Aseta levy asemaan:"
@@ -845,151 +853,151 @@ msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
"Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Päivitä Ubuntun viimeisimpään versioon"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Asennetaan päivityksiä"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versio: %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Noudetaan muutosluetteloa..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
#, fuzzy
msgid "None"
msgstr "Ei-vapaa"
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "%s täytyy noutaa"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Järjestelmäsi on ajan tasalla"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Voit asentaa %s päivityksen"
msgstr[1] "Voit asentaa %s päivitystä"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Odota, tämä voi kestää jonkun aikaa."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Päivitys on valmis"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Uusi versio: %s (koko: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versio: %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Jakeluasi ei enää tueta"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -999,17 +1007,17 @@ msgstr ""
"Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja "
"päivittämisestä osoitteesta http://www.ubuntu.com/"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Uusi jakelujulkaisu \"%s\" on saatavilla</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Ohjelmaluettelo on rikkinäinen"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1371,200 +1379,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 päivitykset"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Yhteisön ylläpitämät (universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Muiden tarjoamat ohjelmat"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Yhteisön ylläpitämät (universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Yhteisön ylläpitämät (universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Ei-vapaat ohjelmat (multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Ei-vapaat ohjelmat (multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "USA:sta vientirajoitetut ohjelmat"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Asennetaan päivityksiä"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Virallisesti tuettu"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 päivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 takaisinsovitukset"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Virallisesti tuettu"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 päivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 takaisinsovitukset"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Yhteisön ylläpitämät (universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Ei-vapaat ohjelmat (multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Rajoitettu tekijänoikeus"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 turvallisuuspäivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 päivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 takaisinsovitukset"
@@ -1917,15 +1943,9 @@ msgstr "DFSG-epäyhteensopivat ohjelmat"
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Muiden tarjoamat ohjelmat"
-
#~ msgid "Non-free software"
#~ msgstr "Ei-vapaat ohjelmat"
-#~ msgid "US export restricted software"
-#~ msgstr "USA:sta vientirajoitetut ohjelmat"
-
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr ""
#~ "Ubuntu-arkiston automaattinen allekirjoitusavain <ftpmaster@ubuntu.com>"
diff --git a/po/fr.po b/po/fr.po
index 18e5ac8a..6847a205 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,115 +17,123 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Quotidiennement"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Tous les deux jours"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Hebdomadaire"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Toutes les deux semaines"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Tous les %s jours"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Après une semaine"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Après deux semaines"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Après un mois"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Après %s jours"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Installation des mises à jour"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Mises à jour des logiciels"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importer la clé"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Erreur lors de l'importation du fichier sélectionné"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Le fichier sélectionné n'est peut-être pas une clé GPG ou alors il est "
"corrompu."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Erreur lors de la suppression de la clé"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"La clé que vous avez sélectionnée ne peut être supprimée. Veuillez rapporter "
"ce bogue."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -136,11 +144,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Veuillez saisir un nom pour le disque"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Veuillez insérer un disque dans le lecteur :"
@@ -859,20 +867,20 @@ msgstr "Téléchargement du fichier %li sur %li à %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"La liste des modifications n'est pas encore disponible. Veuillez réessayer "
"plus tard."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"La liste des modifications n'est pas encore disponible. Veuillez réessayer "
"plus tard."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -880,134 +888,134 @@ msgstr ""
"Échec du téléchargement de la liste des modifications. Veuillez vérifier que "
"votre connexion Internet est activée."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Mettre à jour vers la version la plus récente d'Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Installation des mises à jour"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Impossible d'installer toutes les mises à jour disponibles"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s : \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Téléchargement de la liste des nouveautés…"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Taille du téléchargement : %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Votre système est à jour"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Vous pouvez installer %s mise à jour"
msgstr[1] "Vous pouvez installer %s mises à jour"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Veuillez patienter, cela peut prendre du temps."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "La mise à jour est terminée"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nouvelle version : %s (taille : %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s : \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Votre distribution n'est plus supportée"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1017,17 +1025,17 @@ msgstr ""
"devez passer à une version plus récente d'Ubuntu Linux. Rendez-vous sur "
"http://www.ubuntu.com pour de plus amples informations à ce sujet."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Une nouvelle version « %s » est disponible</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "La liste des logiciels est corrompue"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1397,200 +1405,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Mises à jour pour Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Maintenu par la communauté (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Logiciel contribué"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu Dapper Drake 6.06"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Maintenu par la communauté (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Maintenu par la communauté (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Non-libre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Non-libre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Logiciel restreint à l'export (USA)"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu Dapper Drake 6.06"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Installation des mises à jour"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu Breezy Badger 5.10"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Supportés officiellement"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu Breezy Badger 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Mises à jour pour Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "« Backports » pour Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 Mises à jour de sécurité"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 Mises à jour de sécurité"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Supporté officiellement"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Mises à jour pour Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "« Backports » pour Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu Breezy Badger 5.10"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Maintenu par la communauté (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Non-libre (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Certains logiciels ne sont plus supportés officiellement"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Copyright restreint"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 Mises à jour de sécurité"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Mises à jour pour Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "« Backports » pour Ubuntu 5.10"
@@ -1979,15 +2005,9 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Logiciel contribué"
-
#~ msgid "Non-free software"
#~ msgstr "Logiciel non-libre"
-#~ msgid "US export restricted software"
-#~ msgstr "Logiciel restreint à l'export (USA)"
-
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr ""
#~ "Clé de signature automatique de l'archive Ubuntu <ftpmaster@ubuntu.com>"
diff --git a/po/fur.po b/po/fur.po
index 2cc80acf..32880a22 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,108 +17,116 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Ogni dì"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Ogni dòi dîs"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Ogni setemàne"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Ogni dôs setemànis"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Ogni %s dîs"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Dòpo une setemàne"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Dòpo dôs setemànis"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Dopo un mèis"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Dopo %s dîs"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Impuarte la clâf"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -126,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -756,162 +764,162 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1229,183 +1237,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index e55428b7..5d4b8dc1 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,116 +17,124 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>Detalles</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Instalando actualizacións..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Actualizacións de software"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Fonte"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Fonte"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Erro importando o ficheiro seleccionado"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"O ficheiro seleccionado pode que non sexa un ficheiro de clave GPG ou que "
"esté corrupto."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Erro ao quitar a clave"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
"erro."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -134,11 +142,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -781,16 +789,16 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Hai unha versión nova de Ubuntu dispoñible!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -799,154 +807,154 @@ msgstr ""
"Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión "
"activa."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Actualizacións de seguranza de Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Instalando actualizacións..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
#, fuzzy
msgid "Cannot install all available updates"
msgstr "Comprobando se hai actualizacións..."
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versión %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Descargando cambios"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "O seu sistema está actualizado!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Instalando actualizacións..."
msgstr[1] "Instalando actualizacións..."
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versión %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "A súa distribución xa non está soportada"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1289,205 +1297,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Actualizacións de Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Mantido pola comunidade (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Software contribuido"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Actualizacións de Ubuntu 5.04"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Mantido pola comunidade (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Mantido pola comunidade (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Non libre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Non libre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Software con restriccións de exportación estadounidense"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Actualizacións de Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Actualizacións de seguranza de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Instalando actualizacións..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "Soporte oficial"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Actualizacións de seguranza de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Actualizacións de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Actualizacións de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Soporte oficial"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Actualizacións de seguranza de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Actualizacións de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Actualizacións de Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Mantido pola comunidade (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Non libre (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Soporte oficial"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Dereito de copia restrinxido"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Actualizacións de seguranza de Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Actualizacións de Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Actualizacións de Ubuntu 5.10"
@@ -1733,15 +1759,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "Binario"
-#~ msgid "Contributed software"
-#~ msgstr "Software contribuido"
-
#~ msgid "Non-free software"
#~ msgstr "Software non libre"
-#~ msgid "US export restricted software"
-#~ msgstr "Software con restriccións de exportación estadounidense"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 \"Woody\""
diff --git a/po/he.po b/po/he.po
index 106ac280..02fe3885 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -20,112 +20,120 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "מידי יום"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "כל יומיים"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "כל שבוע"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "כל שבועים"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "כל %s ימים"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "אחרי שבוע"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "אחרי שבועים"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "אחרי חודש"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "אחרי %s ימים"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "מתקין עדכונים..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "עדכוני תוכנה"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "מקור"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "מקור"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "שגיאה בייבוא קובץ נבחר"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "שגיאה בהסרת המפתח"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -136,11 +144,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "אנא הכניסו תקליטור לכונן:"
@@ -781,171 +789,171 @@ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
msgid "Downloading file %li of %li with unknown speed"
msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "גרסה חדשה של אובונטו זמינה!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "עדכוני אבטחה - אובונטו 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "משדרג את אובונטו"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "מתקין עדכונים..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "לא ניתן להתקין את כל העדכונים הזמינים"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "גרסה %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "מוריד שינוייים"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "המערכת שלך מעודכנת!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "מתקין עדכונים..."
msgstr[1] "מתקין עדכונים..."
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
#, fuzzy
msgid "Update is complete"
msgstr "ההורדה הושלמה"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "גרסה %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "ההפצה שלך כבר לא נתמכת, סליחה."
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1288,205 +1296,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "עדכונים - אובונטו 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "מתוחזק ע\"י קהילה (Universe("
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "תוכנה שנתרמה"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "עדכונים - אובונטו 5.04"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "מתוחזק ע\"י קהילה (Universe("
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "מתוחזק ע\"י קהילה (Universe("
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "לא-חופשי (Multiverse("
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "לא-חופשי (Multiverse("
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "תוכנה מוגבלת בארה\"ב"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "עדכונים - אובונטו 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "עדכוני אבטחה - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "מתקין עדכונים..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "נתמך רשמית"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "עדכוני אבטחה - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "עדכונים - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "עדכונים - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "נתמך רשמית"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "עדכוני אבטחה - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "עדכונים - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "עדכונים - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "מתוחזק ע\"י קהילה (Universe("
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "לא-חופשי (Multiverse("
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "נתמך רשמית"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "זכויות יוצרים מגבילות"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "עדכוני אבטחה - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "עדכונים - אובונטו 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "עדכונים - אובונטו 5.10"
@@ -1749,15 +1775,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "בינארי"
-#~ msgid "Contributed software"
-#~ msgstr "תוכנה שנתרמה"
-
#~ msgid "Non-free software"
#~ msgstr "תוכנה לא-חופשית"
-#~ msgid "US export restricted software"
-#~ msgstr "תוכנה מוגבלת בארה\"ב"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "דביאן 3.0 \"וודי\""
diff --git a/po/hi.po b/po/hi.po
index 6a509cb7..0a14e9f3 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,108 +17,116 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -126,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -756,162 +764,162 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1229,183 +1237,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 52847e7a..255a4694 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -18,110 +18,118 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Dnevno"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Svaki drugi dan"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Tjedno"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Svaki drugi tjedan"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Svakih %s dana"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Nakon tjedan dana"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Nakon dva tjedna"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Nakon mjesec dana"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Nakon %s dana"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Instaliraj nadogradnje"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Nadogradnje programa"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Unos ključa"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Greška prilikom uvoženja odabrane datoteke"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Odabrana datoteka možda nije GPG ključ ili je možda oštećena."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Greška prilikom brisanja ključa"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Ključ koji ste odabrali se ne može obrisati. Molimo prijavite ovu grešku."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -132,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Upišite ime za disk"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Ubacite CD u uređaj:"
@@ -847,18 +855,18 @@ msgstr "Preuzimam datoteku %li od %li pri %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -866,99 +874,99 @@ msgstr ""
"Preuzimanje popisa promjena nije uspjelo. Molim, provjerite svoju internet "
"vezu."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Nadogradi na zadnju verziju Ubuntua"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Instaliraj nadogradnje"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Ne mogu instalirati sve dostupne nadogradnje"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Verzija %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Preuzimam popis promjena..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Veličina preuzimanja: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Vaš sustav sadrži posljednje nadogradnje"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -966,35 +974,35 @@ msgstr[0] "Možete instalirati %s nadogradnju"
msgstr[1] "Možete instalirati %s nadogradnje"
msgstr[2] "Možete instalirati %s nadogradnji"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Molim pričekajte, ovo može potrajati."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Nadogradnja je gotova"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nova verzija: %s (Veličina: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Verzija %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Vaša distibucija više nije podržana"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1004,17 +1012,17 @@ msgstr ""
"na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više "
"detalja o nadogradnji."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Popis programa je oštećen"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1373,201 +1381,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 osvježenja"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Održavani od strane zajednice (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Neslobodni (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Održavani od strane zajednice (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Održavani od strane zajednice (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Neslobodni (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Neslobodni (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Instaliraj nadogradnje"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Službeno podržani"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 osvježenja"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 backporti"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Službeno podržani"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 osvježenja"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 backporti"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Održavani od strane zajednice (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Neslobodni (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Neki paketi više nisu službeno podržani"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Ograničeno autorsko pravo"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 osvježenja"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 backporti"
diff --git a/po/hu.po b/po/hu.po
index b6efe310..4e4bda92 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,110 +17,118 @@ msgstr ""
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Naponta"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Kétnaponta"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Hetente"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Minden két hétben"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "%s naponta"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Egy hét után"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Két hét után"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Egy hónap után"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s nap után"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Telepítés"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Szoftverfrissítések"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Kulcs importálása"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Hiba a kiválasztott fájl importálása közben"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Hiba a kulcs eltávolítása közben"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Az Ön által kijelölt kulcs nem távolítható el. Kérem, jelentse ezt hibaként."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Kérem, adja meg a lemez nevét"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:"
@@ -845,16 +853,16 @@ msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp"
msgid "Downloading file %li of %li with unknown speed"
msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "A módosítások listája még nem érhető el. Próbálkozzon később."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "A módosítások listája még nem érhető el. Próbálkozzon később."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -862,133 +870,133 @@ msgstr ""
"A módosítások listájának letöltése meghiúsult. Ellenőrizze az "
"internetkapcsolatát."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 biztonsági frissítések"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Frissítés az Ubuntu legújabb változatára"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Telepítés"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Nem telepíthető minden rendelkezésre álló frissítés"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "%s verzió: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Módosítások listájának letöltése..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Letöltés mérete: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "A rendszere naprakész"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "%s frissítést telepíthet"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Kis türelmet, ez eltarthat egy ideig."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "A frissítés befejeződött"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Új verzió: %s (Méret: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "%s verzió: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "A terjesztés már nem támogatott"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -998,17 +1006,17 @@ msgstr ""
"Frissítsen az Ubuntu Linux egy újabb változatára. A frissítéssel kapcsolatos "
"információkat az http://www.ubuntu.com weboldalon talál."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>A disztribúció új \"%s\" kiadása elérhető</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "A szoftverindex sérült"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1370,201 +1378,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 frissítések"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Közösségi karbantartású (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Nem-szabad (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Közösségi karbantartású (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Közösségi karbantartású (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Nem-szabad (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Nem-szabad (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 biztonsági frissítések"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Telepítés"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Hivatalosan támogatott"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 biztonsági frissítések"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 frissítések"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 visszaportolt csomagok"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Hivatalosan támogatott"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 biztonsági frissítések"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 frissítések"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 visszaportolt csomagok"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Közösségi karbantartású (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Nem-szabad (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Néhány szoftver már nincs hivatalosan támogatva"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Szerzői jogi korlátozás alatt"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 biztonsági frissítések"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 frissítések"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 visszaportolt csomagok"
diff --git a/po/id.po b/po/id.po
index 5714019a..82b44e53 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,111 +16,119 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Harian"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Setiap dua hari"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Mingguan"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Setiap dua minggu"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Setiap %s hari"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Setelah satu minggu"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Setelah dua minggu"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Setelah satu bulan"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Setelah %s hari"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Instal Update"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Perangkat Lunak Mutakhir"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Impor kunci"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Kesalahan mengimpor berkas terpilih"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Berkas terpilih mungkin bukan berkas kunci GPG atau berkas mungkin korup."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Kesalahan menghapus kunci"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Berkas yang anda pilih tidak dapat dihapus. Silakan laporkan ini sebagai bug."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Silakan masukkan nama untuk cakram"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Silakan masukan cakram ke dalam penggerak"
@@ -840,16 +848,16 @@ msgstr "Mengunduh berkas %li dari %li dengan %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -857,133 +865,133 @@ msgstr ""
"Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet "
"anda."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Pemutakhiran lewat Internet"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Upgrade ke versi Ubuntu terakhir"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Instal Update"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versi %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Mengunduh senarai dari perubahan..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Ukuran unduh: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Sistem anda telah up-to-date"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Anda dapat instal %s pemutakhiran"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Pemutakhiran selesai"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Versi baru: %s (Ukuran: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versi %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Distribusi anda tidak disokong lagi"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -993,17 +1001,17 @@ msgstr ""
"lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www."
"ubuntu.com untuk informasi lebih lanjut."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Luncuran distribusi baru '%s' telah tersedia</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Indeks perangkat lunak telah rusak"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1364,199 +1372,216 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Dikelola oleh komunitas (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Tidak-bebas (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 LTS Updates"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Dikelola oleh komunitas (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Dikelola oleh komunitas (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Tidak-bebas (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Tidak-bebas (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Pemutakhiran lewat Internet"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Instal Update"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Resmi disokong"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
#, fuzzy
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 6.06 LTS Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
#, fuzzy
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 6.06 LTS Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 6.06 LTS Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Resmi disokong"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 6.06 LTS Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 6.06 LTS Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 6.06 LTS Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Dikelola oleh komunitas (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Tidak-bebas (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Beberapa perangkat lunak tidak lagi resmi disokong"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Hak cipta terlarang"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 6.06 LTS Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 6.06 LTS Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 6.06 LTS Backports"
diff --git a/po/it.po b/po/it.po
index a9c5d7df..b38a79e6 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -18,115 +18,123 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Ogni giorno"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Ogni due giorni"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Ogni settimana"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Ogni due settimane"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Ogni %s giorni"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Dopo una settimana"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Dopo due settimane"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Dopo un mese"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Dopo %s giorni"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Installazione degli aggiornamenti"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Aggiornamenti Software"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Sorgente"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Sorgente"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importa chiave"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Errore nell'importare il file selezionato"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe "
"essere corrotto."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Errore nel rimuovere la chiave"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"La chiave selezionata non può essere rimossa. Notificare questo evento come "
"bug."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -137,11 +145,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Inserire un nome per il disco"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Inserire un disco nell'unità:"
@@ -857,18 +865,18 @@ msgstr "Scaricamento del file %li di %li a %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Scaricamento del file %li di %li a velocità sconosciuta"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -876,134 +884,134 @@ msgstr ""
"Fallito lo scaricamento dell'elenco dei cambiamenti. Verificare la "
"connessione ad Internet."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Aggiorna all'ultima versione di Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Installazione degli aggiornamenti"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Impossibile installare tutti gli aggiornamenti disponibili"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versione %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Scaricamento dell'elenco dei cambiamenti..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Dati da scaricare: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Il sistema è aggiornato!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "È possibile installare %s aggiornamento"
msgstr[1] "È possibile installare %s aggiornamenti"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Attendere, l'operazione potrebbere richiedere del tempo."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Aggiornamento completato"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nuova versione: %s (Dimensione: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versione %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "La distribuzione in uso non è più supportata"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1013,17 +1021,17 @@ msgstr ""
"versione più aggiornata di Ubuntu Linux. Per maggiori informazioni "
"consultare http://www.ubuntu.com"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "L'indice dei programmi è rovinato"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1389,201 +1397,219 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Aggiornamenti di Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Mantenuto dalla comunità (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Software contribuito"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Mantenuto dalla comunità (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Mantenuto dalla comunità (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Non libero (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Non libero (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Software non esportabile dagli USA"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Installazione degli aggiornamenti"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Supportato ufficialmente"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Aggiornamenti di Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Backport di Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Supportato ufficialmente"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Aggiornamenti di Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Backport di Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Mantenuto dalla comunità (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Non libero (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Software non più supportato ufficialmente"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Copyright con restrizioni"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Aggiornamenti di sicurezza per Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Aggiornamenti di Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Backport di Ubuntu 5.10"
@@ -1951,15 +1977,9 @@ msgstr "Software non compatibile con le DFSG"
#~ msgid "Binary"
#~ msgstr "Binario"
-#~ msgid "Contributed software"
-#~ msgstr "Software contribuito"
-
#~ msgid "Non-free software"
#~ msgstr "Software non libero"
-#~ msgid "US export restricted software"
-#~ msgstr "Software non esportabile dagli USA"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian·3.0·\"Woody\""
diff --git a/po/ja.po b/po/ja.po
index 67e4b650..56e3fa45 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -18,112 +18,120 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "X 日ごとに"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "2日ごと"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "X 週ごとに"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "2週ごと"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "%s 日ごと"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "1週間後"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "2週間後"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "1ヶ月後"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s 日後"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "アップデートをインストール中"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "ソフトウェアのアップデート"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "ソース"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "ソース"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "鍵のインポート"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "選択したファイルのインポートエラー"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"選択したファイルはGPG鍵ファイルではないか、壊れている可能性があります。"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "鍵削除のエラー"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "選択した鍵を削除できませんでした。バグとして報告してください。"
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -134,11 +142,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "ディスク名を入力してください"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "ディスクをドライブに挿入してください:"
@@ -834,16 +842,16 @@ msgstr "ダウンロード中: %li のうち %li 速度 %s/秒"
msgid "Downloading file %li of %li with unknown speed"
msgstr "ダウンロード中: 速度不明で %li のうち %li"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "変更点がまだ取得できません。あとで試してください。"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "変更点がまだ取得できません。あとで試してください。"
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -851,133 +859,133 @@ msgstr ""
"変更点の取得に失敗しました。インターネットに接続されているか確認してくださ"
"い。"
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 セキュリティアップデート"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Ubuntu の最新バージョンにアップグレード"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "アップデートをインストール中"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "すべてのアップデートをインストールすることができません"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "バージョン %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "変更点を取得中..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "ダウンロードサイズ: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "システムは最新の状態です!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "%s 個のアップデートがインストールされます"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "しばらくお待ちください。少々時間がかかります。"
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "アップデートが完了しました"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "新しいバージョン: %s (サイズ: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "バージョン %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "このディストリビューションはすでにサポート対象外です"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -987,17 +995,17 @@ msgstr ""
"Ubuntu Linux にアップグレードしてください。\r\n"
"アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "ソフトウェアのインデックスが壊れています"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1358,200 +1366,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 アップデート"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "コミュニティによるメンテナンス (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "寄贈ソフトウェア"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "コミュニティによるメンテナンス (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "コミュニティによるメンテナンス (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "非フリー (Multiuniverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "非フリー (Multiuniverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 セキュリティアップデート"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "アップデートをインストール中"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu·5.10·'Breezy·Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "公式サポート"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu·5.10·'Breezy·Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 セキュリティアップデート"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 アップデート"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 バックポート"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "公式サポート"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 セキュリティアップデート"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 アップデート"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 バックポート"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu·5.10·'Breezy·Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "コミュニティによるメンテナンス (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "非フリー (Multiuniverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "いくつかのソフトウェアはもう公式にサポートされません"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "限定的な著作権(Restricted)"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 セキュリティアップデート"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 アップデート"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 バックポート"
@@ -1955,15 +1981,9 @@ msgstr "DFSGに適合しないソフトウェア"
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "寄贈ソフトウェア"
-
#~ msgid "Non-free software"
#~ msgstr "非フリーソフトウェア"
-#~ msgid "US export restricted software"
-#~ msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア"
-
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
diff --git a/po/ka.po b/po/ka.po
index d80fcac3..b5602a0e 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -19,112 +19,120 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: KBabel 1.11.2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "ყოველ დღიურად"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "ყოველ 2 დღეში"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "კვირეული"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "ყოველ 2 კვირაში"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "ყოველ %s დღეში"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "ერთ კვირაში"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "ორი კვირის შემდგომ"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "ერთი თვის შემდგომ"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s დღის შემდეგ"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "განახლებების _დაყენება"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "პროგრამული განახლებები"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "გასაღების იმპორტი"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "ამორჩეული ფაილის იმპორტი ვერ მოხერხდა"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"ამორჩეული ფაილი შეიძლება არ იყოს GPG გასაღების ფაილი ან შეიძლება იყოს "
"დაზიანებული."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "გასღების წაშლა ვერ მოხერხდა"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -135,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "შეიყვანეთ დისკის სახელი"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "მოათავსეთ დისკი დისკწამყვანში:"
@@ -819,152 +827,152 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr "ვერ განხორციელდა -სკენ სია ის ინტერნეტი."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "განახლება -სკენ ვერსია ის"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "განახლებების _დაყენება"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "ვერსია %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "მიმდინარეობს ჩამოქაჩვა სია ის."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "ჩამოსატვირთის ზომა: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "თქვენი სისტემა განახლებულია"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "განახლება გასრულებულია"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "ახალი ვერსია: %s (ზომა: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "ვერსია %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
#, fuzzy
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
@@ -974,17 +982,17 @@ msgstr ""
"თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი "
"იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "პროგრამების სიის ინდექსი დაზიანებულია"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
#, fuzzy
msgid ""
"It is impossible to install or remove any software. Please use the package "
@@ -1346,200 +1354,215 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/ s s s s s"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 განახლებები"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "არათავისუფალი (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "არათავისუფალი (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "არათავისუფალი (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "განახლებების _დაყენება"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 განახლებები"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 დამატებითი პროგრამები"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 განახლებები"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 დამატებითი პროგრამები"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "არათავისუფალი (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "არა"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
#, fuzzy
msgid "Restricted copyright"
msgstr "შეზღუდული"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 განახლებები"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 დამატებითი პროგრამები"
diff --git a/po/ko.po b/po/ko.po
index 539fe6e8..f2212584 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,109 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "매일"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "이틀 마다"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "매주"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "두 주 마다"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "%s 일 마다"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "한 주 후에"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "두 주 후에"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "한 달 후에"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s 일 후에"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "업데이트를 설치(_I)"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "소프트웨어 업데이트"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "키 가져오기"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "선택한 파일 가져오기 오류"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못된 것입니다."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "키 삭제 오류"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -130,11 +138,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "디스크에 사용할 이름을 입력하십시오."
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "드라이브에 디스크를 넣으십시오:"
@@ -830,149 +838,149 @@ msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
"바뀐 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "우분투 5.10 보안 업데이트"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "우분투 최신 버젼으로 업그레이드 합니다."
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "업데이트를 설치(_I)"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "설치할 수 없는 업데이트가 있습니다"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "버전 %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "바뀐 목록을 다운로드 하는 중..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "다운로드 크기: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "시스템이 최신의 상태입니다."
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다."
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "업데이트가 끝났습니다."
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "새 버전: %s (크기: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "버전 %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "더 이상 지원되지 않는 배포판입니다."
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -982,17 +990,17 @@ msgstr ""
"그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에"
"서 보실 수 있습니다."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>새 배포판 '%s'를 이용할 수 있습니다</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "소프트웨어 목록이 망가졌습니다."
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1345,201 +1353,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "우분투 5.10 업데이트"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "커뮤니티에서 관리유지함 (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "자유소프트웨어 아님 (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "우분투 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "커뮤니티에서 관리유지함 (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "커뮤니티에서 관리유지함 (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "자유소프트웨어 아님 (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "자유소프트웨어 아님 (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "우분투 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "우분투 5.10 보안 업데이트"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "업데이트를 설치(_I)"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "우분투 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "공식적으로 지원됨"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "우분투 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "우분투 5.10 보안 업데이트"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "우분투 5.10 업데이트"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "우분투 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "우분투 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "공식적으로 지원됨"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "우분투 5.10 보안 업데이트"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "우분투 5.10 업데이트"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "우분투 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "우분투 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "커뮤니티에서 관리유지함 (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "자유소프트웨어 아님 (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다."
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "저작권 제한됨"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "우분투 5.10 보안 업데이트"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "우분투 5.10 업데이트"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "우분투 5.10 Backports"
diff --git a/po/ku.po b/po/ku.po
index 32eb3214..2029bd01 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,108 +17,116 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Rojane"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Her du roj"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Heftane"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Her du hefte"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Her %s roj"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Piştî hefteyekê"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Piştî du hefte"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Piştî mehekê"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Piştî %s roj"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -126,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -757,163 +765,163 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Ubuntu tê bilindkirin"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Guhertoya %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Mezinahiya daxistinê: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Sîstema te rojane ye"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Tu dikarî %s rojanekirinê saz bikî"
msgstr[1] "Tu dikarî %s rojanekirinan saz bikî"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Rojanekirin temam bû"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Guhertoya nû: %s (Mezinahî: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Guhertoya %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1235,194 +1243,209 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Neazad (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Neazad (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Neazad (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Bi piştgirtiya fermî"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
#, fuzzy
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
#, fuzzy
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Bi piştgirtiya fermî"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Neazad (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Bi piştgirtiya fermî"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index f4691734..47688c99 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,110 +17,118 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
"100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Kasdien"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Kas dvi dienas"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Kas savaitę"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Kas dvi savaites"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Kas %s dienas"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Po savaitės"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Po dviejų savaičių"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Po mėnesio"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Po %s dienų"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Diegiami atnaujinimai"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Programinės įrangos atnaujinimai"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importuoti raktą"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Importuojant pasirinktą failą įvyko klaida"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Pasirinktas failas gali būti sugadintas arba ne GPG rakto failas."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Šalinant raktą įvyko klaida"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Įveskite disko pavadinimą"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Įdėkite diską į įrenginį:"
@@ -836,114 +844,114 @@ msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 saugumo atnaujinimai"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Atnaujinti iki naujausios Ubuntu versijos"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Diegiami atnaujinimai"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Negalima įdiegti visų galimų atnaujinimų"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versija %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Atsiunčiamas pakeitimų sąrašas..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Atsiuntimo dydis: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Jūsų sistema atnaujinta"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -951,35 +959,35 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus"
msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus"
msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Palaukite, tai gali užtrukti."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Atnaujinimas užbaigtas"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nauja versija: %s (Dydis: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versija %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Jūsų distribucija daugiau nebepalaikoma"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -989,17 +997,17 @@ msgstr ""
"Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie "
"atnaujinimą rasite http://www.ubuntu.com ."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Programinės įrangos turinys sugadintas"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1364,200 +1372,217 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 atnaujinimai"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Prižiūrima bendruomenės (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Ne Laisva (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 „Dapper Drake“"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Prižiūrima bendruomenės (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Prižiūrima bendruomenės (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Ne Laisva (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Ne Laisva (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 „Dapper Drake“"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 saugumo atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Diegiami atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 „Breezy Badger“"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Oficialiai palaikoma"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 „Breezy Badger“"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 saugumo atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 „Breezy Badger“"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Prižiūrima oficialiai"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 saugumo atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 „Breezy Badger“"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Prižiūrima bendruomenės (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Ne Laisva (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Apribotos autorinės teisės"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 saugumo atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 atnaujinimai"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 atnaujinimai"
diff --git a/po/mk.po b/po/mk.po
index 41a8e55c..45c9194a 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,115 +17,123 @@ msgstr ""
"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
"X-Generator: KBabel 1.10\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>Детали</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Инсталирам надградби..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Надградба на софтвер"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Изворен код"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Изворен код"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Грешка при увоз на избраната датотека"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Избраната датотека може да не е GPG датотека или пак може да е расипана."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Грешка при отстранување на клучот"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
"како бубачка."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -133,11 +141,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -784,16 +792,16 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Достапна е нова верзија на Убунту!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -802,101 +810,101 @@ msgstr ""
"Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет "
"врска е активна."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Безбедносни надградби за Debian Stable"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Инсталирам надградби..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
#, fuzzy
msgid "Cannot install all available updates"
msgstr "Проверувам за надградби..."
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Верзија %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Преземам промени"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, fuzzy, python-format
msgid "Download size: %s"
msgstr "Преземам промени"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Вашиот систем е надграден!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -904,53 +912,53 @@ msgstr[0] "Инсталирам надградби..."
msgstr[1] "Инсталирам надградби..."
msgstr[2] "Инсталирам надградби..."
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Верзија %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Вашата дистрибуција повеќе не е поддржана"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1294,202 +1302,220 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Надградби за Убунту 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Оддржувано од заедницата (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Додатен софтвер"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Надградби за Убунту 5.04"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Оддржувано од заедницата (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Оддржувано од заедницата (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Неслободно (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Неслободно (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Забранет софтвер во САД"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Надградби за Убунту 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Безбедносни надградби за Debian Stable"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Инсталирам надградби..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Официјално поддржано"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Безбедносни надградби за Убунту 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Надградби за Убунту 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Надградби за Убунту 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Официјално поддржано"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr "Безбедносни надградби за Убунту 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr "Надградби за Убунту 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Надградби за Убунту 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Оддржувано од заедницата (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Неслободно (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Официјално поддржано"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Restricted copyright"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Безбедносни надградби за Убунту 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Надградби за Убунту 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Надградби за Убунту 5.10"
@@ -1767,15 +1793,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "Бинарни"
-#~ msgid "Contributed software"
-#~ msgstr "Додатен софтвер"
-
#~ msgid "Non-free software"
#~ msgstr "Неслободен софтвер"
-#~ msgid "US export restricted software"
-#~ msgstr "Забранет софтвер во САД"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 \"Woody\""
diff --git a/po/ms.po b/po/ms.po
index c11414eb..c48e70bd 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,111 +17,119 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Harian"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Setiap dua hari"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Mingguan"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Setiap dua minggu"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Setiap %s hari"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Selepas satu minggu"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Selepas dua minggu"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Selepas satu bulan"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Selepas %s hari"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Kekunci impot"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Ralat semasa mengimpot fail yang dipilih"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Fail yang dipilih mungkin bukan fail kekunci GPG atau fail mungkin rosak"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Ralat semasa mengeluarkan kekunci"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Kekunci yang anda pilih tidak dapat di keluarkan. Sila laporkan ini sebagai "
"ralat pepijat."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -132,11 +140,11 @@ msgstr ""
"↵\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Sila masukkan nama untuk cakera padat"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Sila masukkan cakera padat kedalam pemacu"
@@ -796,162 +804,162 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1269,184 +1277,198 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi."
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index fc7aedb4..9e675e7d 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,112 +17,120 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Daglig"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Annenhver dag"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Ukentlig"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Hver andre uke"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Hver %s dag"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Etter en uke"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Etter to uker"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Etter en måned"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Etter %s dager"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Installerer oppdateringer"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Programvareoppdateringer"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Kilde"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Kilde"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importer nøkkel"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Feil under importering av valgt fil"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Enten er valgt fil ikke en GPG-nøkkelfil, eller så er den kanskje skadet"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Kunne ikke fjerne nøkkelen"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Nøkkelen du valgte kan ikke fjernes. Vennligst rapporter denne feilen."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -133,11 +141,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Vennligst oppgi et navn for platen"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Vennligst sett inn en plate i CD-spilleren:"
@@ -848,16 +856,16 @@ msgstr "Laster ned filen %li av %li med %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Laster ned fil %li av %li ved ukjent hastighet"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -865,134 +873,134 @@ msgstr ""
"Kunne ikke laste ned listen med endringer. Vennligst kontrollér "
"internettilkoblingen."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Oppgrader til siste versjon av Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Installerer oppdateringer"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Kan ikke installere alle tilgjengelige oppdateringer."
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versjon %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Laster ned listen med endringer..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Nedlastingsstørrelse: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Systemet ditt er oppdatert!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Du kan installere %s oppdatering"
msgstr[1] "Du kan installere %s oppdateringer"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Vennligst vent, dette kan ta litt tid."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Oppdateringen er fullført"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Ny versjon: %s (Størrelse: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versjon %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Din distribusjon er ikke lenger støttet"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1002,17 +1010,17 @@ msgstr ""
"oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www."
"ubuntu.com for mer informasjon om oppgradering."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Ny versjon \"%s\" er tilgjengelig</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Programvareoversikten er ødelagt."
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1374,201 +1382,219 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Oppdateringer"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Vedlikeholdt av miljøet (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Bidratt programvare"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Vedlikeholdt av miljøet (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Vedlikeholdt av miljøet (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "US eksport begrenset programvare"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Installerer oppdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Offisielt støttet"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Oppdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Offisielt støttet"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Oppdateringer"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Vedlikeholdt av miljøet (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Non-free (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Noe programvare er ikke lenger offisielt støttet"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Begrenset opphavsrett"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 4.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Backports"
@@ -1879,15 +1905,9 @@ msgstr "Ikke-DFSG-kompatibel programvare"
#~ msgid "Binary"
#~ msgstr "Binær"
-#~ msgid "Contributed software"
-#~ msgstr "Bidratt programvare"
-
#~ msgid "Non-free software"
#~ msgstr "Non-free programvare"
-#~ msgid "US export restricted software"
-#~ msgstr "US eksport begrenset programvare"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 «Woody»"
diff --git a/po/ne.po b/po/ne.po
index c521494d..e20b5a99 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -18,112 +18,120 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2;plural=(n!=0)\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>विवरणहरु</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "सफ्टवेयर अद्यावधिकहरु"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "स्रोत"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "स्रोत"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "कुञ्जि हटाउँदा त्रुटि"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -773,169 +781,169 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "संस्करण %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, fuzzy, python-format
msgid "Download size: %s"
msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "तपाइं को प्रणालि अप-टु-डेट छ!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै"
msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "संस्करण %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "तपाईंको वितरण समर्थित छैन"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1279,206 +1287,224 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "योगदान गरिएको सफ्टवेयर"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "नन-फ्री (बहुभर्स)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "नन-फ्री (बहुभर्स)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "युएस निषेधित सफ्टवेयर"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "कार्यालय बाट समर्थित"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
#, fuzzy
msgid "Ubuntu 5.10 Security Updates"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
#, fuzzy
msgid "Ubuntu 5.10 Updates"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "कार्यालय बाट समर्थित"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "नन-फ्री (बहुभर्स)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "कार्यालय बाट समर्थित"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "निषेधित प्रतिलिपि अधिकार"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
@@ -1746,15 +1772,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "बाईनरी"
-#~ msgid "Contributed software"
-#~ msgstr "योगदान गरिएको सफ्टवेयर"
-
#~ msgid "Non-free software"
#~ msgstr "नन-फ्री सफ्टवेयर"
-#~ msgid "US export restricted software"
-#~ msgstr "युएस निषेधित सफ्टवेयर"
-
#, fuzzy
#~ msgid "Debian Unstable \"Sid\""
#~ msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
diff --git a/po/nl.po b/po/nl.po
index 0039dc95..3979d843 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,113 +16,121 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Dagelijks"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Elke twee dagen"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Wekelijks"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Elke twee weken"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Elke %s dagen"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Na één week"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Na twee weken"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Na één maand"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Na %s dagen"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Up_dates installeren"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Software-updates"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Sleutel importeren"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Fout bij het importeren van het geselecteerde bestand."
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Het geselecteerde bestand is misschien geen GPG-sleutel, of het kan "
"beschadigd zijn."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Fout bij het verwijderen van de sleutel"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"De door u geselecteerde sleutel kon niet verwijderd worden. Gelieve dit als "
"fout te melden."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -133,11 +141,11 @@ msgstr ""
"↵\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Geef het cd-schijfje een naam"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Plaats een schijf in de speler:"
@@ -853,20 +861,20 @@ msgstr "Downloaden van bestand %li uit %li met %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Downloaden van bestand %li uit %li, snelheid onbekend"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. "
"Probeer het later nog eens."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. "
"Probeer het later nog eens."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -874,134 +882,134 @@ msgstr ""
"Kon de lijst met wijzigingen niet downloaden. Controleer uw "
"internetverbinding."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 veiligheidsupdates"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Upgrade naar de nieuwste versie van Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Up_dates installeren"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Kan de beschikbare updates niet installeren"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versie %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Het overzicht van de wijzigingen wordt gedownload..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Downloadgrootte: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Uw systeem is up-to-date"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "U kunt %s update installeren"
msgstr[1] "U kunt %s updates installeren"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Een ogenblik geduld, dit kan even duren."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "De update is voltooid"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nieuwe versie: %s (Grootte: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versie %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Uw distributie wordt niet langer ondersteund"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1011,17 +1019,17 @@ msgstr ""
"upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu."
"com voor meer informatie over upgraden."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Software-index is beschadigd"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1382,201 +1390,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 updates"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Door de gemeenschap beheerd (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Niet-vrij (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Door de gemeenschap beheerd (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Door de gemeenschap beheerd (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Niet-vrij (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Niet-vrij (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 veiligheidsupdates"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Up_dates installeren"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Officieel ondersteund"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 veiligheidsupdates"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Officieel ondersteund"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 veiligheidsupdates"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Door de gemeenschap beheerd (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Niet-vrij (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Bepaalde software wordt niet meer officieel ondersteund"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Beperkte auteursrechten"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 veiligheidsupdates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 backports"
diff --git a/po/no.po b/po/no.po
index ce95de07..dbe32eff 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,113 +17,121 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>Detaljer</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Installerer oppdateringer..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Programvareoppdateringer"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Kilde"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Kilde"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Feil under importering av fil"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Feil under fjerning av nøkkel"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -778,169 +786,169 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Security Updates"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Installerer oppdateringer..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versjon %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Laster ned endringer"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, fuzzy, python-format
msgid "Download size: %s"
msgstr "Laster ned endringer"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Systemet er helt oppdatert!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Installerer oppdateringer..."
msgstr[1] "Installerer oppdateringer..."
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versjon %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Din distribusjon er ikke lenger støttet"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1283,205 +1291,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Updates"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Vedlikeholdt av miljøet (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Bidratt programvare"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 5.04 Updates"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Vedlikeholdt av miljøet (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Vedlikeholdt av miljøet (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Non-free (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "US eksport begrenset programvare"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 5.04 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Installerer oppdateringer..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "Offisielt støttet"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Offisielt støttet"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Vedlikeholdt av miljøet (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Non-free (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Offisielt støttet"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Begrenset opphavsrett"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 4.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Updates"
@@ -1760,15 +1786,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "Binær"
-#~ msgid "Contributed software"
-#~ msgstr "Bidratt programvare"
-
#~ msgid "Non-free software"
#~ msgstr "Non-free programvare"
-#~ msgid "US export restricted software"
-#~ msgstr "US eksport begrenset programvare"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 «Woody»"
diff --git a/po/oc.po b/po/oc.po
index 2a369d2a..c62d7e82 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+0200\n"
"PO-Revision-Date: 2006-05-29 08:11+0000\n"
"Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
"com>\n"
@@ -18,111 +18,119 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Cada jorn"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Cada dos jorns"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Cada setmana"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Cada dos setmanas"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Cada %s jorns"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Après una setmana"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Après dos setmanas"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Après un mes"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Après %s jorns"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importar clau"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Error al moment d'importar lo fichièr seleccionat"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Lo fichièr seleccionat es benlèj pas una clau GPG o es possible que siá "
"corrumput."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Error al moment de suprimir la clau"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Avem pas poscut suprimir la clau qu'avètz seleccionada. Raportatz l'anomalia."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -133,11 +141,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Picatz un nom pel disc"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Metètz un disc dins lo legidor :"
@@ -764,164 +772,164 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Metre a jorn Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "<b>Mesas a jorn per internet</b>"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s : \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Talha de la descarga : %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Podètz installar %s mesa a jorn"
msgstr[1] "Podètz installar %s mesas a jorn"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s : \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1243,197 +1251,212 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Pas liure (multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Pas liure (multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Pas liure (multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
#, fuzzy
msgid "Ubuntu 5.10 Security Updates"
msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
#, fuzzy
msgid "Ubuntu 5.10 Updates"
msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Pas liure (multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 396fec53..14d8ece1 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,110 +17,118 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.9.1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>ਵੇਰਵਾ</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -128,11 +136,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -763,164 +771,164 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1252,185 +1260,199 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index a54f3a7a..d82309de 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,111 +17,119 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Codziennie"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Co dwa dni"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Co tydzień"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Co dwa tygodnie"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Co %s dni"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Po tygodniu"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Po dwóch tygodniach"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Po miesiącu"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Po %s dniach"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Instalowanie pakietów"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Aktualizacje oprogramowania"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Źródłowy"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Źródłowy"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Zaimportuj klucz"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Błąd podczas importowania wybranego pliku"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Błąd podczas usuwania klucza"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -132,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Proszę podać nazwę dla płyty"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Proszę włożyć płytę do napędu:"
@@ -846,16 +854,16 @@ msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Pobieranie pliku %li z %li z nieznaną prędkością"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -863,99 +871,99 @@ msgstr ""
"Nie udało się pobrać informacji o zmianach. Proszę sprawdzić połączenie z "
"Internetem."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Zaktualizuj do najnowszej wersji Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Instalowanie pakietów"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Wersja %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Pobieranie informacji o zmianach..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Rozmiar do pobrania: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Twój system jest w pełni zaktualizowany"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -963,35 +971,35 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s"
msgstr[1] "Ilość dostępnych aktualizacji: %s"
msgstr[2] "Ilość dostępnych aktualizacji: %s"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Proszę czekać, to może chwilę potrwać."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Aktualizacja została ukończona."
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nowa wersja: %s (Rozmiar: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Wersja %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Twoja dystrybucja nie jest już wspierana"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1001,17 +1009,17 @@ msgstr ""
"krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. "
"Odwiedź http://www.ubuntu.com po więcej informacji."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Spis oprogramowania jest uszkodzony"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1374,200 +1382,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Aktualizacje dla Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Utrzymywane przez społeczność (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Inne oprogramowanie (Contributed)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Utrzymywane przez społeczność (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Utrzymywane przez społeczność (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Nie-wolnodostępne (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Nie-wolnodostępne (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Instalowanie pakietów"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Wspierane oficjalnie"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Aktualizacje dla Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Wspierane oficjalnie"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Aktualizacje dla Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Utrzymywane przez społeczność (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Nie-wolnodostępne (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Niektóre programy nie są już oficjalnie wspierane"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "O ograniczonych prawach kopiowania"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Aktualizacje dla Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
@@ -1951,15 +1977,9 @@ msgstr "Oprogramowanie niekompatybilne z DFSG."
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Inne oprogramowanie (Contributed)"
-
#~ msgid "Non-free software"
#~ msgstr "Oprogramowanie nie-wolnodostępne"
-#~ msgid "US export restricted software"
-#~ msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA"
-
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr "Klucz automatycznego podpisu archiwum Ubuntu <ftpmaster@ubuntu.com>"
diff --git a/po/pt.po b/po/pt.po
index 1ed06dff..9c701587 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -15,112 +15,120 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Diariamente"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "De 2 em 2 dias"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Semanalmente"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "De 2 em 2 semanas"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Todos os %s dias"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Após uma semana"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Após duas semanas"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Após um mês"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Depois de %s dias"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "A instalar actualizações"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Actualizações de Software"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importar chave"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Erro ao importar ficheiro seleccionado"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"O ficheiro seleccionado pode não ser um ficheiro de chave GPG ou pode estar "
"corrompido."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Erro ao remover a chave"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"A chave que seleccionou não pôde ser removida. Por favor reporte este erro."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -131,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Por favor introduza um nome para o disco"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Por favor introduza um disco no leitor:"
@@ -847,18 +855,18 @@ msgstr "A descarregar ficheiro %li de %li a %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"A lista de alterações ainda não está disponível. Por favor tente mais tarde."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"A lista de alterações ainda não está disponível. Por favor tente mais tarde."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -866,134 +874,134 @@ msgstr ""
"Falha a descarregar a lista de alterações. Por favor verifique a sua ligação "
"à internet."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Actualizações de Segurança"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Actualize para a última versão do Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "A instalar actualizações"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Impossível de instalar todas as actualizações disponíveis"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versão %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "A descarregar lista de alterações..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Tamanho do download: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "O seu sistema está actualizado"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Pode instalar %s actualização"
msgstr[1] "Pode instalar %s actualizações"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Por favor aguarde, isto pode levar algum tempo."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "A actualização está completa"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nova versão: %s (Tamanho: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versão %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "A sua distribuição já não é suportada"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1003,17 +1011,17 @@ msgstr ""
"versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais "
"informação em como actualizar."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "O índice de software está quebrado"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1375,201 +1383,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Actualizações"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Mantido pela comunidade (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Não-livre (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Mantido pela comunidade (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Mantido pela comunidade (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Não-livre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Não-livre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Actualizações de Segurança"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "A instalar actualizações"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Suportado Oficialmente"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Actualizações de Segurança"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Actualizações"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Suportado Oficialmente"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Actualizações de Segurança"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Actualizações"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Mantido pela comunidade (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Não-livre (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Algum software já não é suportado oficialmente"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Direitos de autor restritos"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 Actualizações de Segurança"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 Actualizações"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Backports"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5a47815c..57131852 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,115 +16,123 @@ msgstr ""
"X-Poedit-Country: BRAZIL\n"
"Plural-Forms: nplurals=2; plural=n > 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Diário"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "A cada dois dias"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Semanalmente"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "A cada duas semanas"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "A cada %s dias"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Após uma semana"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Após duas semanas"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Após um mês"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Após %s dias"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Instalando Atualizações"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Modificando os canais de programas"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importar Chave"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Erro importando o arquivo selecionado"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"O arquivo selecionado pode não ser um arquivo de chave GPG ou pode estar "
"corrompido."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Erro removendo a chave"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"A chave que você selecionou não pôde se removida. Por favor reporte isto "
"como um erro."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -135,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Por favor digite um nome para o disco"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Por favor insira um disco no drive:"
@@ -850,20 +858,20 @@ msgstr "Obtendo arquivo %li de %li a %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"A lista de alterações não está disponível ainda. Por favor, tente novamente "
"mais tarde."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"A lista de alterações não está disponível ainda. Por favor, tente novamente "
"mais tarde."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -871,134 +879,134 @@ msgstr ""
"Não foi possível baixar a lista de mudanças. Por favor, verifique sua "
"conexão com a internet."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Atualizações de Segurança do Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Atualizar para a última versão do Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Instalando Atualizações"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Não foi possível instalar todas as atualizações disponíveis"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Obtendo a lista de alterações"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Tamanho do download: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Seu sistema está atualizado"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Você pode instalar %s atualização"
msgstr[1] "Você pode instalar %s atualizações"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Por favor, espere, isto pode levar algum tempo."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Atualização completa"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "New version: %s (Tamanho: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Sua distribuição não é mais suportada"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1008,17 +1016,17 @@ msgstr ""
"falhas de segurança. Atualize para uma versão mais nova do Ubuntu Linux. "
"Veja http://www.ubuntu-br.org"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "A índex de software está quebrado"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1384,200 +1392,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Atualizações do Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Mantido pela Comunidade (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Contributed software"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Mantido pela Comunidade (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Mantido pela Comunidade (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Não-livre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Não-livre (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "US export restricted software"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Atualizações de Segurança do Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Instalando Atualizações"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Suporte oficial"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Atualizações de Segurança do Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Atualizações do Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Backports do Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Suportado Oficialmente"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Atualizações de Segurança do Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Atualizações do Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Backports do Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Mantido pela Comunidade (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Não-livre (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Alguns softwares não são mais oficialmente suportado."
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Restrito por copyright"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Atualizações do Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Backports do Ubuntu 5.10"
@@ -2012,15 +2038,9 @@ msgstr "Programas não compatíveis com a DFSG"
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Contributed software"
-
#~ msgid "Non-free software"
#~ msgstr "Non-free software"
-#~ msgid "US export restricted software"
-#~ msgstr "US export restricted software"
-
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
diff --git a/po/ro.po b/po/ro.po
index df181e9a..e4231744 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,116 +17,124 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n %\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Zilnic"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "La fiecare două zile"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Săptămânal"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "La fiecare 2 săptămâni"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "La fiecare %s zile"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "După o saptămână"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "După două săptămâni"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "După o lună"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "După %s zile"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_Instalează actualizarile"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Actualizări software"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr ""
"Binar\n"
"Sursă"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr ""
"Binar\n"
"Sursă"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
#, fuzzy
msgid "Import key"
msgstr "Importă cheie"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Eroare la importarea fişierului selectat"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Fişierul selectat nu pare a fi o cheie GPG sau poate fi corupt."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Eroare la ştergerea cheii."
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Cheia selectată nu poate fi ştearsă. Raportaţi această eroare."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -137,11 +145,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Introduceţi un nume pentru disc"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Introduceţi un disc în unitate:"
@@ -784,16 +792,16 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Nu există nici un pachet de actualizat."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -802,100 +810,100 @@ msgstr ""
"Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o "
"conexiune internet activă."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Actualizări de Securitate Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Se actualizează Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_Instalează actualizarile"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Versiunea %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Se descarcă listă schimbărilor..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Sistemul dumneavoastră este actualizat la zi!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -903,53 +911,53 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Versiunea nouă: %s (Mărime: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versiunea %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Distribuţia dvs. nu mai este suportată"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1295,202 +1303,220 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Actualizări Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Pachete întreţinute de comunitate (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Software în contribuţie"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Pachete întreţinute de comunitate (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Pachete întreţinute de comunitate (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Pachete non-libere (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Pachete non-libere (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Software cu restricţii de export din SUA"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Actualizări de Securitate Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_Instalează actualizarile"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Pachete suportate oficial"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Actualizări de Securitate Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Actualizări Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Pachete suportate oficial"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Actualizări de Securitate Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Actualizări Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Pachete întreţinute de comunitate (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Pachete non-libere (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Pachete suportate oficial"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Copyright restrictiv"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Actualizări de securitate Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Actualizări Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Actualizări de securitate Ubuntu 5.04"
@@ -1738,15 +1764,9 @@ msgstr ""
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Software în contribuţie"
-
#~ msgid "Non-free software"
#~ msgstr "Software non-liber"
-#~ msgid "US export restricted software"
-#~ msgstr "Software cu restricţii de export din SUA"
-
#, fuzzy
#~ msgid ""
#~ "<big><b>Available Updates</b></big>\n"
diff --git a/po/ru.po b/po/ru.po
index aa147236..616a59c8 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -18,110 +18,118 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Ежедневно"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Каждые два дня"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Еженедельно"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Каждые две недели"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Каждые %s дней"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Через неделю"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Через две недели"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Через месяц"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Через %s дней"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Установить обновления"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Обновления программ"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Импортировать ключ"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Ошибка при импортировании выбранного файла"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Возможно выбранный файл не является файлом ключа GPG или поврежден."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Ошибка при удалении ключа"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -132,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Введите название для диска"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Пожалуйста, вставьте диск в привод:"
@@ -843,18 +851,18 @@ msgstr "Загрузка файла %li из %li со скоростью %s/с"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Загрузка файла %li из %li с неизвестной скоростью"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr ""
"На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
"На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -862,99 +870,99 @@ msgstr ""
"Не удалось загрузить список изменений. Пожалуйста, проверьте соединение с "
"интернет."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Обновления безопасности Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Обновить систему до последней версии Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Установить обновления"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Невозможно установить все доступные обновления"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Версия %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Загрузка списка изменений..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Размер загружаемых данных: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Ваша система не требует обновления"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -962,35 +970,35 @@ msgstr[0] "Вы можете установить %s обновление"
msgstr[1] "Вы можете установить %s обновления"
msgstr[2] "Вы можете установить %s обновлений"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Пожалуйста подождите, это может занять некоторое время."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Обновление завершено"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Новая версия: %s (Размер: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Версия %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Ваша версия Ubuntu больше не поддерживается"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1000,17 +1008,17 @@ msgstr ""
"обновления. Обновите систему до более поздней версии Ubuntu Linux. Для "
"получения информации об обновлении посетите http://www.ubuntu.com"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Доступен новый релиз дистрибутива '%s'</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Индекс программ поврежден"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1369,201 +1377,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Обновления Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Поддерживается сообществом (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Несвободное (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Поддерживается сообществом (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Поддерживается сообществом (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Несвободное (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Несвободное (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Обновления безопасности Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Установить обновления"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Официально поддерживается"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Обновления безопасности Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Обновления Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Официально поддерживается"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Обновления безопасности Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Обновления Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Поддерживается сообществом (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Несвободное (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Некоторые программы больше не поддерживаются официально"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Ограниченные авторские права"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Обновления безопасности Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Обновления Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Backports"
diff --git a/po/rw.po b/po/rw.po
index c19cfd45..1eae4fdb 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -24,114 +24,122 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<B B"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Kwinjiza porogaramu"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Ibihuzagihe bya porogaramumudasobwa"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
#, fuzzy
msgid "Error importing selected file"
msgstr "Kuzaza Byahiswemo IDOSIYE"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
#, fuzzy
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
#, fuzzy
msgid "Error removing the key"
msgstr "i Urufunguzo"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
#, fuzzy
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -139,11 +147,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -778,16 +786,16 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "ni a Gishya Bya Bihari"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -795,152 +803,152 @@ msgid ""
msgstr ""
"Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza"
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "5"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Kwinjiza porogaramu"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, fuzzy, python-format
msgid "Version %s: \n"
msgstr "Verisiyo \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Iyimura... i"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Sisitemu ni Hejuru Kuri Itariki"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Sisitemu ni Hejuru Kuri Itariki"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Verisiyo \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Ikwirakwiza... ni Oya"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1280,205 +1288,221 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "5"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Kohereza Nta gukoresha bisesuye"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "5"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Kigenga"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Kigenga"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Kohereza Nta gukoresha bisesuye"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Kwinjiza porogaramu"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "5"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
#, fuzzy
msgid "Ubuntu 5.10 Security Updates"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
#, fuzzy
msgid "Ubuntu 5.10 Updates"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "5"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "5"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
#, fuzzy
msgid "Non-free (Multiverse)"
msgstr "Kigenga"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
#, fuzzy
msgid "Restricted copyright"
msgstr "Uburenganzira bw'umuhimbyi"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "5"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "5"
@@ -1803,10 +1827,6 @@ msgstr ""
#~ msgstr "Kigenga"
#, fuzzy
-#~ msgid "US export restricted software"
-#~ msgstr "Kohereza Nta gukoresha bisesuye"
-
-#, fuzzy
#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
#~ msgstr "com"
diff --git a/po/sk.po b/po/sk.po
index bab83ef0..8714b482 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,111 +17,119 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural= (n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Denne"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Každý druhý deň"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Raz týždenne"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Každý druhý týždeň"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Každých %s dní"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Po jednom týždni"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Po dvoch týždňoch"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Po mesiaci"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Po %s dňoch"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Nainštalovať _aktualizácie"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Aktualizácie softvéru"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Zdrojový"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Zdrojový"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importovať kľúč"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Chyba pri importovaní vybraného súboru"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Vybraný súbor nie je autentifikačným kľúčom GPG alebo je poškodený."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Chyba pri odstraňovaní kľúča"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Vybraný kľúč nebolo možné odstrániť. Nahláste to ako chybu."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -132,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Prosím, zadajte názov disku"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Prosím, vložte disk do mechaniky:"
@@ -844,16 +852,16 @@ msgstr "Sťahovanie súboru %li z %li pri %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -861,99 +869,99 @@ msgstr ""
"Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové "
"pripojenie."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Aktualizovať na najnovšiu verziu Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Nainštalovať _aktualizácie"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Verzia %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Získava sa zoznam zmien..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Veľkosť na stiahnutie: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Váš systém je aktuálny"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -961,35 +969,35 @@ msgstr[0] "Môžete nainštalovať %s aktualizáciu"
msgstr[1] "Môžete nainštalovať %s aktualizácie"
msgstr[2] "Môžete nainštalovať %s aktualizácií"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Čakajte prosím, toto môže chvíľu trvať."
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Aktualizácia je dokončená"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Nová verzia: %s (veľkosť: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Verzia %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Vaša distribúcia už nie je podporovaná"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1000,17 +1008,17 @@ msgstr ""
"Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu."
"com.\""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Index softvéru je poškodený"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1375,201 +1383,219 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 - aktualizácie"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Udržiavané komunitou (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Softvér závislý na neslobornom softvéri"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Udržiavané komunitou (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Udržiavané komunitou (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Neslobodné (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Neslobodné (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Softvér s obmedzených exportom pre USA"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Nainštalovať _aktualizácie"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Oficiálne podporované"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 - aktualizácie"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 - backporty"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Oficiálne podporované"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 - aktualizácie"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 - backporty"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Udržiavané komunitou (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Neslobodné (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Niektoré programy už nie sú viac oficiálne podporované"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "S obmedzujúcou licenciou"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 bezpečnostné aktualizácie"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 4.10 aktualizácie"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 - backporty"
@@ -1922,15 +1948,9 @@ msgstr "Softvér nekompatibilný s DFSG"
#~ msgid "Binary"
#~ msgstr "Binárny"
-#~ msgid "Contributed software"
-#~ msgstr "Softvér závislý na neslobornom softvéri"
-
#~ msgid "Non-free software"
#~ msgstr "Neslobodný softvér"
-#~ msgid "US export restricted software"
-#~ msgstr "Softvér s obmedzených exportom pre USA"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 \"Woody\""
diff --git a/po/sr.po b/po/sr.po
index 67267f54..c2cd91c3 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -18,108 +18,116 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Svaki dan"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Svaki drugi dan"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Svake nedelje"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Svake druge nedelje"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Svakih %s dana"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Posle jedne nedelje"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Posle dve nedelje"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Posle jednog meseca"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Posle %s dana"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importiranje kljuca"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -127,11 +135,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -760,110 +768,110 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -871,52 +879,52 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1234,183 +1242,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 73b452a0..34bd43c1 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,114 +17,122 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Dagligen"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Varannan dag"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Varje vecka"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Varannan vecka"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Var %s:e dag"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Efter en vecka"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Efter två veckor"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Efter en månad"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Efter %s dagar"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "%d uppdateringar"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, fuzzy, python-format
+msgid "%s (%s)"
+msgstr "%s - %s/s"
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, fuzzy, python-format
msgid "Server for %s"
msgstr "Server"
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Programvaruuppdateringar"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
#, fuzzy
msgid "Active"
msgstr "Aktivera"
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Källkod"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Källkod"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Importera nyckel"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Fel vid importing av vald fil"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Den valda filen verkar inte vara en GPG-nyckel eller så är filen trasig."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Fel vid borttagning av nyckeln"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Nyckeln du valde kan inte tas bort. Var vänlig anmäl detta som en bugg."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -135,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Skriv in ett namn på skivan"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Sätt in en skiva i enheten:"
@@ -847,16 +855,16 @@ msgstr "Hämtar hem fil %li av %li i %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Hämtar hem fil %li av %li med okänd hastighet"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare"
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
@@ -864,137 +872,137 @@ msgstr ""
"Misslyckades med att hämta listan med ändringar. Kontrollera din "
"internetanslutning."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
#, fuzzy
msgid "Recommended updates of Ubuntu"
msgstr "%d uppdateringar"
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Uppdatera till senaste versionen av Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Uppdateringar"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "Det går inte att installera alla tillgängliga uppdateringar"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Version %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "Hämtar lista med ändringar..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr "Markera _inga"
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr "Markera _alla"
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
#, fuzzy
msgid "None"
msgstr "en"
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
#, fuzzy
msgid "1 KB"
msgstr "%d kB"
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, fuzzy, python-format
msgid "%.0f KB"
msgstr "%.2f MB"
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, fuzzy, python-format
msgid "%.1f MB"
msgstr "%.2f MB"
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "Nerladdningsstorlek: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "Ditt system är uppdaterat"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Du kan installera %s uppdatering"
msgstr[1] "Du kan installera %s uppdateringar"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "Var god vänta, det här kan ta lite tid"
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "Uppdateringen är färdig"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "Ny version: %s (Storlek: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s:"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, fuzzy, python-format
msgid "(Size: %s)"
msgstr "Storlek:"
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "Din distribution stöds inte längre"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -1004,17 +1012,17 @@ msgstr ""
"till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer "
"information om att uppgradera."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "Indexet för program är trasigt"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1380,202 +1388,220 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Uppdateringar"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Gemenskapsunderhållen (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Bidragen programvara"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Gemenskapsunderhållen (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Gemenskapsunderhållen (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Ickefri (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Ickefri (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Programvara med USA-exportbegränsningar"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 \"Dapper Drake\""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
#, fuzzy
msgid "Recommended updates"
msgstr "%d uppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "%d uppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
#, fuzzy
msgid "Backported updates"
msgstr "%d uppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Stöds officiellt"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Uppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 Bakåtportar"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "Stöds officiellt"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Uppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 Bakåtportar"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Gemenskapsunderhållen (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Ickefri (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Viss programvara har inte längre officiellt stöd"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Begränsad upphovsrätt"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 Uppdateringar"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 Bakåtportar"
@@ -1978,15 +2004,9 @@ msgstr "Inte DFSG-kompatibel programvara"
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "Bidragen programvara"
-
#~ msgid "Non-free software"
#~ msgstr "Ickefri programvara"
-#~ msgid "US export restricted software"
-#~ msgstr "Programvara med USA-exportbegränsningar"
-
#~ msgid "Sources"
#~ msgstr "Källor"
@@ -3665,9 +3685,6 @@ msgstr "Inte DFSG-kompatibel programvara"
#~ msgid "%%p%%%% (%s of %s) - %s/s"
#~ msgstr "%%p%%%% (%s av %s) - %s/s"
-#~ msgid "%s - %s/s"
-#~ msgstr "%s - %s/s"
-
#~ msgid "Downloading data..."
#~ msgstr "Hämtar data..."
diff --git a/po/th.po b/po/th.po
index 013adc5c..afcc2d56 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,109 +16,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "ทุกวัน"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "ทุก 2 วัน"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "ทุกอาทิตย์"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "ทุก 2 อาทิตย์"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "ทุก %s วัน"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "หลังจาก 1 อาทิตย์"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "หลังจาก 2 อาทิตย์"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "หลังจาก 1 เดือน"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "หลังจาก %s วัน"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "_ติดตั้งปรัยปรุง"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "ซอฟต์แวร์ปรับปรุง"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "นำเข้ากุญแจ"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "ไม่สามารถนำเข้าไฟล์ที่เลือกไว้"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "ไฟล์ที่เลือกไว้อาจจะไม่ใช่ GPG กุญแจไฟล์หรืออาจจะเสียหาย"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "มีปัญหาขณะลบกุจแจ"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา"
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -129,11 +137,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิสก์"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:"
@@ -807,149 +815,149 @@ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li
msgid "Downloading file %li of %li with unknown speed"
msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง"
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
"ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ"
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "อูบันตู 5.10 Security Updates"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "_ติดตั้งปรัยปรุง"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "รุ่น %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "ขนาดดาวน์โหลด: %s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "ระบบของคุณทันสมัยแล้ว"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย"
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "ปรับปรุงเสร็จสิ้นแล้ว"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "รุ่นใหม่: %s (ขนาด: %s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "รุ่น %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -959,17 +967,17 @@ msgstr ""
"ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com "
"สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "ดัชนีของซอฟแวร์เสียหาย"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1318,201 +1326,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "อูบันตู 5.10 Updates"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "ชุมชนดูแล (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "ไม่ฟรี(ลิขสิทธิ์)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "อูบันตู 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "ชุมชนดูแล (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "ชุมชนดูแล (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "ไม่ฟรี(ลิขสิทธิ์)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "ไม่ฟรี(ลิขสิทธิ์)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "อูบันตู 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "อูบันตู 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "_ติดตั้งปรัยปรุง"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "อูบันตู 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "สนับสนุนอย่างเป็นทางการ"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "อูบันตู 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "อูบันตู 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "อูบันตู 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "อูบันตู 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "อูบันตู 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "สนับสนุนอย่างเป็นทางการ"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "อูบันตู 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "อูบันตู 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "อูบันตู 5.10 Backports"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "อูบันตู 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "ชุมชนดูแล (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "ไม่ฟรี(ลิขสิทธิ์)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "จำกัดลิขสิทธิ์"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "อูบันตู 5.10 Security Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "อูบันตู 5.10 Updates"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "อูบันตู 5.10 Backports"
diff --git a/po/tr.po b/po/tr.po
index bcf26874..f1a299ec 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,109 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Günlük"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Her iki günde bir"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Haftalık"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Her iki haftada bir"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Her %s günde bir"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Bir hafta sonra"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "İki hafta sonra"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Bir ay sonra"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s gün sonra"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Kanal Düzenle"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Anahtar aktar"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Seçili dosyayı aktarmada hata"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Seçili dosya bir GPG anahtar dosyası olmayabilir veya bozuk olabilir."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Anahtar kaldırmada hata"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Seçtiğiniz anahtar kaldırılamadı. Lütfen bunu bir hata olarak iletin."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -130,11 +138,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Lütfen disk için bir isim girin"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Lütfen sürücüye bir disk yerleştirin:"
@@ -778,162 +786,162 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1256,196 +1264,211 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Sınırlı telif hakkı"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Resmi olarak desteklenenler"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Resmi olarak desteklenenler"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Resmi olarak desteklenenler"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Sınırlı telif hakkı"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
diff --git a/po/uk.po b/po/uk.po
index d9e4931b..2b33d01f 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -15,113 +15,121 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>Подробиці</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
#, fuzzy
msgid "Every two days"
msgstr "Кожні %s днів"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Кожні %s днів"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Через %s днів"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Встановлення оновлень..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Оновлення програм"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Текст програми"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Текст програми"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "Імпортувати ключ"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Помилка імпорту вибраного файлу"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Помилка видалення ключа"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -129,11 +137,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "Введіть назву диску"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "Вставте диск в пристрій:"
@@ -800,16 +808,16 @@ msgstr "Завантажується файл %li of %li at %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Завантажується файл %li of %li на невизначенії швидкості"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Доступний новий випуск Ubuntu!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -817,102 +825,102 @@ msgid ""
msgstr ""
"не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Оновлення безпеки Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "Апгрейд системи Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Встановлення оновлень..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
#, fuzzy
msgid "Cannot install all available updates"
msgstr "Пошук пакунків для апгрейду"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Версія %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Завантаження змін"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Ваша система оновлена!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -920,54 +928,54 @@ msgstr[0] "Неможливо провести апргрейд системи"
msgstr[1] "Неможливо провести апргрейд системи"
msgstr[2] "Неможливо провести апргрейд системи"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
#, fuzzy
msgid "Update is complete"
msgstr "Завантадення пакунків завершено"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Версія %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Ваш дистрибутив вже не підтримується"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1312,205 +1320,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Оновлення Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Підтримується спільнотою (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Супутнє програмне забезпечення"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Оновлення Ubuntu 5.04"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Підтримується спільнотою (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Підтримується спільнотою (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Не-вільний (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Не-вільний (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "ПЗ під експортними обмеженнями США"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Оновлення Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Оновлення безпеки Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Встановлення оновлень..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "Офіціально підтримуються"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Оновлення безпеки Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Оновлення Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Оновлення Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Офіціально підтримуються"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Оновлення безпеки Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Оновлення Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Оновлення Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Підтримується спільнотою (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Не-вільний (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Офіціально підтримуються"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Обмежені авторські права"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Оновлення безпеки Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Оновлення Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Оновлення Ubuntu 5.10"
@@ -1772,15 +1798,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "Двійковий"
-#~ msgid "Contributed software"
-#~ msgstr "Супутнє програмне забезпечення"
-
#~ msgid "Non-free software"
#~ msgstr "Не вільне програмне забезпечення"
-#~ msgid "US export restricted software"
-#~ msgstr "ПЗ під експортними обмеженнями США"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 \"Woody\""
diff --git a/po/update-manager.pot b/po/update-manager.pot
index 8df83d5f..225e73e8 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,108 +17,116 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -126,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -756,162 +764,162 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1229,183 +1237,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/ur.po b/po/ur.po
index 0ca4f881..0064ae7b 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,109 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "روز"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "ھر دو دن"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "ھفتھ وار"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "ھر دو ھفتے"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "ھر %s دن"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "ایک ھفتھ"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "دو ھفتھ باد"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "ایک ماھ باد"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "بعد %s دن"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
#, fuzzy
msgid "Import key"
msgstr "امپورٹ کی"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -127,11 +135,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -757,162 +765,162 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1231,183 +1239,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/urd.po b/po/urd.po
index 19309f94..0a34f9a4 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,109 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "روز"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "ھر دو دن"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "ھفتھ وار"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "ھر دو ھفتے"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "ھر %s دن"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "ایک ھفتھ"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "دو ھفتھ باد"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "ایک ماھ باد"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "بعد %s دن"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, python-format
msgid "%s updates"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
#, fuzzy
msgid "Import key"
msgstr "امپورٹ کی"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -127,11 +135,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -757,162 +765,162 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
msgid "Important security updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1231,183 +1239,197 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
msgid "Important security updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/vi.po b/po/vi.po
index d2b8372b..0c564a83 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,111 +16,119 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: LocFactoryEditor 1.2.2\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "Hằng ngày"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "Hằng hai ngày"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "Hằng tuần"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "Hằng hai tuần"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "Hằng %s ngày"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "Sau một tuần"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "Sau hai tuần"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "Sau một tháng"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "Sau %s ngày"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Đang cài đặt bản cập nhật..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Bản cập nhật phần mềm"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "Nguồn"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "Nguồn"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "Gặp lỗi khi nhập tâp tin đã chọn"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "Gặp lỗi khi gỡ bỏ khóa"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -128,11 +136,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -766,16 +774,16 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Có một bản phát hành Ubuntu mới công bố."
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
@@ -784,153 +792,153 @@ msgstr ""
"Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động "
"chưa."
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Đang cài đặt bản cập nhật..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
#, fuzzy
msgid "Cannot install all available updates"
msgstr "Đang kiểm tra có cập nhật..."
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "Phiên bản %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "Đang tải các thay đổi"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Hệ thống bạn toàn mới nhất."
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "Phiên bản %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Không còn hỗ trợ lại bản phát hành của bạn."
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1272,205 +1280,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Bản cập nhật Ubuntu 5.10"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "Do cộng đồng bảo quản (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "Phần mềm đã đóng góp"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Bản cập nhật Ubuntu 5.04"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Do cộng đồng bảo quản (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "Do cộng đồng bảo quản (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "Không tự do (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Không tự do (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "Phần mềm bị giới hạn xuất Mỹ"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Bản cập nhật Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Đang cài đặt bản cập nhật..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "Được hỗ trợ một cách chính thức"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Bản cập nhật Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Bản cập nhật Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "Được hỗ trợ một cách chính thức"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Bản cập nhật Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Bản cập nhật Ubuntu 5.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "Do cộng đồng bảo quản (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "Không tự do (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "Được hỗ trợ một cách chính thức"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "Bản quyền bị giới hạn"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Bản cập nhật bảo mặt Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Bản cập nhật Ubuntu 4.10"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Bản cập nhật Ubuntu 5.10"
@@ -1713,15 +1739,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "Nhị phân"
-#~ msgid "Contributed software"
-#~ msgstr "Phần mềm đã đóng góp"
-
#~ msgid "Non-free software"
#~ msgstr "Phần mềm không tự do"
-#~ msgid "US export restricted software"
-#~ msgstr "Phần mềm bị giới hạn xuất Mỹ"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 « Woody »"
diff --git a/po/xh.po b/po/xh.po
index 3150d03d..1fc12d1e 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -17,109 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "Bonisa izihlaziyo"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "Bonisa izihlaziyo"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -127,11 +135,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -757,165 +765,165 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Kukho i-%i yohlaziyo ekhoyo"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Bonisa izihlaziyo"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "Bonisa izihlaziyo"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1241,185 +1249,199 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+msgid "Restricted software"
+msgstr ""
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
+#: ../data/channels/Ubuntu.info.in:79
+msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Bonisa izihlaziyo"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "Bonisa izihlaziyo"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
msgid "No longer oficially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
msgid "Ubuntu 4.10 Backports"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bf3055a0..b36da2ac 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -16,115 +16,123 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "每天"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "每两天"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "每周"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "每两周"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "每%s天"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "一周后"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "两周后"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "一月后"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s天后"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "安装更新"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "软件更新"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr ""
"二进制\n"
"源代码"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr ""
"二进制\n"
"源代码"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "导入密钥"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "在导入所选文件时出错"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "所选文件可能不是GPG密钥文件或者已经损坏."
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "删除密钥时候出错"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "你所选择的密钥不能被删除。请汇报这个bug"
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -135,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "请输入光盘的名称"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "请将光盘插入到光驱里:"
@@ -803,148 +811,148 @@ msgstr "正在下载文件 %li/%li 速度是 %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "正在下载文件 %li/%li 速度未知"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "变动列表尚不可用。请稍后再试。"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "变动列表尚不可用。请稍后再试。"
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr "无法下载更新列表。请检查您的网络连接。"
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 安全更新"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "升级到最新版本的Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "安装更新"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "无法安装所有升级"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "版本 %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "正在下载更新列表..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "下载文件大小:%s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "您的系统已为最新"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "你可以安装 %s 个更新"
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "请稍等,这需要花一些时间。"
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "更新完成"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "新版本:%s(大小:%s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "版本 %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "您的发行版不再被支持"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -954,17 +962,17 @@ msgstr ""
"\r\n"
"http://www.ubuntu.com 来获取更多有关升级的信息。"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>新发行版 '%s' 可用</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "软件索引已被破坏"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1320,200 +1328,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 更新"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "社区维护(Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "贡献的软件"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6-06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "社区维护(Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "社区维护(Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "非自由(Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "非自由(Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "美国限制出口的软件"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6-06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 安全更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "安装更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "官方支持"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 安全更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 移植"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 安全更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 安全更新"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
msgid "Oficially supported"
msgstr "官方支持"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 安全更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 移植"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "社区维护(Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "非自由(Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "一些软件已经不在被官方支持."
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "版权限制"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 安全更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 移植"
@@ -1764,11 +1790,5 @@ msgstr "非DFSG兼容软件"
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Contributed software"
-#~ msgstr "贡献的软件"
-
#~ msgid "Non-free software"
#~ msgstr "非自由软件"
-
-#~ msgid "US export restricted software"
-#~ msgstr "美国限制出口的软件"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0f4a3c0e..65eb63ef 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -15,112 +15,120 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
#, fuzzy
msgid "Daily"
msgstr "<b>細節</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr ""
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "正在安裝軟件更新..."
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "軟件更新"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
#, fuzzy
msgid "(Source Code)"
msgstr "源程式碼"
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
#, fuzzy
msgid "Source Code"
msgstr "源程式碼"
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "匯入指定檔案時發生錯誤"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "選定的檔案可能不是 GPG 密碼匙,或者內容已損壞。"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "移除密碼匙時發生錯誤"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "你選定的密碼匙無法移除,請匯報問題。"
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -128,11 +136,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -769,170 +777,170 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "Ubuntu 已推出新版本!"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
#, fuzzy
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 安全性更新"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
msgid "Updates of Ubuntu"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "正在安裝軟件更新..."
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
#, fuzzy
msgid "Cannot install all available updates"
msgstr "正在檢查更新套件..."
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "版本 %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
#, fuzzy
msgid "Downloading the list of changes..."
msgstr "正在下載更改紀錄"
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
#, fuzzy
msgid "Your system is up-to-date"
msgstr "系統已經在最新狀態!"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "版本 %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "已經不再支援你用的發行版本"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1273,205 +1281,223 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 更新"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "協力維護軟件 (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "協力維護軟件"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
#, fuzzy
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 5.04 更新"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "協力維護軟件 (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "協力維護軟件 (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "非自由軟件 (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "非自由軟件 (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:87
+#, fuzzy
+msgid "By copyright or legal issues restricted software"
+msgstr "美國禁止出口軟件"
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 5.04 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 安全性更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "正在安裝軟件更新..."
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
#, fuzzy
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
#, fuzzy
msgid "Officially supported"
msgstr "官方支援"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 安全性更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
#, fuzzy
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "官方支援"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 安全性更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "協力維護軟件 (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "非自由軟件 (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
#, fuzzy
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "官方支援"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "版權受限"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 安全性更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 4.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 更新"
@@ -1712,15 +1738,9 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "可執行檔"
-#~ msgid "Contributed software"
-#~ msgstr "協力維護軟件"
-
#~ msgid "Non-free software"
#~ msgstr "非自由軟件"
-#~ msgid "US export restricted software"
-#~ msgstr "美國禁止出口軟件"
-
#~ msgid "Debian 3.0 \"Woody\""
#~ msgstr "Debian 3.0 “Woody”"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f73c1f29..62a2dc1f 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-09-05 13:07+0200\n"
+"POT-Creation-Date: 2006-09-10 01:15+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"
@@ -15,109 +15,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../SoftwareProperties/SoftwareProperties.py:135
+#: ../SoftwareProperties/SoftwareProperties.py:136
msgid "Daily"
msgstr "每天"
-#: ../SoftwareProperties/SoftwareProperties.py:136
+#: ../SoftwareProperties/SoftwareProperties.py:137
msgid "Every two days"
msgstr "每兩天"
-#: ../SoftwareProperties/SoftwareProperties.py:137
+#: ../SoftwareProperties/SoftwareProperties.py:138
msgid "Weekly"
msgstr "每周"
-#: ../SoftwareProperties/SoftwareProperties.py:138
+#: ../SoftwareProperties/SoftwareProperties.py:139
msgid "Every two weeks"
msgstr "每隔兩周"
-#: ../SoftwareProperties/SoftwareProperties.py:143
+#: ../SoftwareProperties/SoftwareProperties.py:144
#, python-format
msgid "Every %s days"
msgstr "每隔 %s 天"
-#: ../SoftwareProperties/SoftwareProperties.py:166
+#: ../SoftwareProperties/SoftwareProperties.py:167
msgid "After one week"
msgstr "一週後"
-#: ../SoftwareProperties/SoftwareProperties.py:167
+#: ../SoftwareProperties/SoftwareProperties.py:168
msgid "After two weeks"
msgstr "兩週後"
-#: ../SoftwareProperties/SoftwareProperties.py:168
+#: ../SoftwareProperties/SoftwareProperties.py:169
msgid "After one month"
msgstr "一個月後"
-#: ../SoftwareProperties/SoftwareProperties.py:173
+#: ../SoftwareProperties/SoftwareProperties.py:174
#, python-format
msgid "After %s days"
msgstr "%s 天過後"
#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../SoftwareProperties/SoftwareProperties.py:235
+#: ../SoftwareProperties/SoftwareProperties.py:252
#, fuzzy, python-format
msgid "%s updates"
msgstr "安裝更新套件(_I)"
-#: ../SoftwareProperties/SoftwareProperties.py:294
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
msgid "Main server"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:316
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
#, python-format
msgid "Server for %s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:302
+#: ../SoftwareProperties/SoftwareProperties.py:324
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:323
+#: ../SoftwareProperties/SoftwareProperties.py:345
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:580
-#: ../SoftwareProperties/SoftwareProperties.py:597
+#: ../SoftwareProperties/SoftwareProperties.py:601
+#: ../SoftwareProperties/SoftwareProperties.py:618
#, fuzzy
msgid "Software Channel"
msgstr "軟體更新"
-#: ../SoftwareProperties/SoftwareProperties.py:588
-#: ../SoftwareProperties/SoftwareProperties.py:605
+#: ../SoftwareProperties/SoftwareProperties.py:609
+#: ../SoftwareProperties/SoftwareProperties.py:626
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:690
+#: ../SoftwareProperties/SoftwareProperties.py:711
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:696
+#: ../SoftwareProperties/SoftwareProperties.py:717
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:945
+#: ../SoftwareProperties/SoftwareProperties.py:966
msgid "Import key"
msgstr "匯入金鑰"
-#: ../SoftwareProperties/SoftwareProperties.py:955
+#: ../SoftwareProperties/SoftwareProperties.py:976
msgid "Error importing selected file"
msgstr "匯入指定檔案時發生錯誤"
-#: ../SoftwareProperties/SoftwareProperties.py:956
+#: ../SoftwareProperties/SoftwareProperties.py:977
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "選定的檔案可能不是 GPG 金鑰,或者內容已損壞。"
-#: ../SoftwareProperties/SoftwareProperties.py:968
+#: ../SoftwareProperties/SoftwareProperties.py:989
msgid "Error removing the key"
msgstr "移除金鑰時發生錯誤"
-#: ../SoftwareProperties/SoftwareProperties.py:969
+#: ../SoftwareProperties/SoftwareProperties.py:990
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "您選定的金鑰無法移除,請匯報問題。"
-#: ../SoftwareProperties/SoftwareProperties.py:1015
+#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -128,11 +136,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1072
+#: ../SoftwareProperties/SoftwareProperties.py:1093
msgid "Please enter a name for the disc"
msgstr "請輸入光碟的名稱"
-#: ../SoftwareProperties/SoftwareProperties.py:1088
+#: ../SoftwareProperties/SoftwareProperties.py:1109
msgid "Please insert a disc in the drive:"
msgstr "請將光碟放入光碟機:"
@@ -796,149 +804,149 @@ msgstr "正在下載檔案 %li/%li,下載速度為 %s/秒"
msgid "Downloading file %li of %li with unknown speed"
msgstr "正在下載檔案 %li/%li,下載速度不明"
-#: ../UpdateManager/UpdateManager.py:187
+#: ../UpdateManager/UpdateManager.py:197
#, fuzzy
msgid "The list of changes is not available"
msgstr "修改紀錄不存在,請稍後再試。"
-#: ../UpdateManager/UpdateManager.py:193
+#: ../UpdateManager/UpdateManager.py:203
msgid "The list of changes is not available yet. Please try again later."
msgstr "修改紀錄不存在,請稍後再試。"
-#: ../UpdateManager/UpdateManager.py:198
+#: ../UpdateManager/UpdateManager.py:208
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr "無法下載更動列表。請檢查網路連線是否正常。"
-#: ../UpdateManager/UpdateManager.py:218
+#: ../UpdateManager/UpdateManager.py:228
#, fuzzy
msgid "Important security updates of Ubuntu"
msgstr "Ubuntu 5.10 安全性更新"
-#: ../UpdateManager/UpdateManager.py:220
+#: ../UpdateManager/UpdateManager.py:230
msgid "Recommended updates of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:222
+#: ../UpdateManager/UpdateManager.py:232
msgid "Proposed updates for Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:223
+#: ../UpdateManager/UpdateManager.py:233
msgid "Backports of Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:224
+#: ../UpdateManager/UpdateManager.py:234
#, fuzzy
msgid "Updates of Ubuntu"
msgstr "升級到最新版本的 Ubuntu"
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
#, fuzzy
msgid "Other updates"
msgstr "安裝更新套件(_I)"
-#: ../UpdateManager/UpdateManager.py:266
+#: ../UpdateManager/UpdateManager.py:276
msgid "Cannot install all available updates"
msgstr "無法安裝所有更新套件"
-#: ../UpdateManager/UpdateManager.py:267
+#: ../UpdateManager/UpdateManager.py:277
msgid ""
-"Some of the updates require more extensive changesthan expected.\n"
+"Some of the updates require more extensive changes than expected.\n"
"\n"
-"This usually mean that your system is not fully upgraded or that you run a "
+"This usually means that you have enabled unoffical repositories, that it is "
+"not fully upgraded from the last distribution release or that you run a "
"development release of the distribution.\n"
"\n"
"Would you like to perform a full distribution upgrade now?"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:461
+#: ../UpdateManager/UpdateManager.py:474
#, python-format
msgid "Version %s: \n"
msgstr "版本 %s: \n"
-#: ../UpdateManager/UpdateManager.py:522
+#: ../UpdateManager/UpdateManager.py:535
msgid "Downloading the list of changes..."
msgstr "正在下載修改紀錄..."
-#: ../UpdateManager/UpdateManager.py:546
+#: ../UpdateManager/UpdateManager.py:559
msgid "Select _None"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:551
+#: ../UpdateManager/UpdateManager.py:565
msgid "Select _All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:596
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdateManager.py:599
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:597
+#: ../UpdateManager/UpdateManager.py:602
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:600
+#: ../UpdateManager/UpdateManager.py:605
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
-#: ../UpdateManager/UpdateManager.py:642
+#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
#, python-format
msgid "Download size: %s"
msgstr "下載大小:%s"
-#: ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:632
msgid "Your system is up-to-date"
msgstr "系統已經在最新狀態"
-#: ../UpdateManager/UpdateManager.py:638
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "您可以安裝 %s 個更新"
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:671
+#: ../UpdateManager/UpdateManager.py:676
msgid "Please wait, this can take some time."
msgstr "請稍候,這可能需要一點時間。"
-#: ../UpdateManager/UpdateManager.py:673
+#: ../UpdateManager/UpdateManager.py:678
msgid "Update is complete"
msgstr "更新完成"
-#: ../UpdateManager/UpdateManager.py:822
+#: ../UpdateManager/UpdateManager.py:830
#, fuzzy, python-format
msgid "From version %s to %s"
msgstr "新版本:%s (大小:%s)"
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:834
#, fuzzy, python-format
msgid "Version %s"
msgstr "版本 %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:828
+#: ../UpdateManager/UpdateManager.py:836
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:846
msgid "Your distribution is not supported anymore"
msgstr "您正使用的發行版本已不再支援"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:847
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -947,17 +955,17 @@ msgstr ""
"您不會再取得任何安全或重大更新,請升級到最新版本的 Ubuntu Linux。請參閱 "
"http://www.ubuntu.com以取得更多升級資訊。"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:866
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>有新的 distribution 發行版 '%s'</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:901
msgid "Software index is broken"
msgstr "軟體索引損壞"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:902
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1306,201 +1314,218 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
-#: ../data/channels/Ubuntu.info.in:7
+#: ../data/channels/Ubuntu.info.in:8
#, fuzzy
msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr "Ubuntu 5.10 更新"
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:15
+#, fuzzy
+msgid "Community maintained"
+msgstr "協力維護軟體 (Universe)"
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:20
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Restricted software"
+msgstr "非自由軟體 (Multiverse)"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:28
+#: ../data/channels/Ubuntu.info.in:29
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:71
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 ‘Dapper Drake‘"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:73
-msgid ""
-"OpenSource software that is officially supported by Canonical Ltd. (main)"
+#: ../data/channels/Ubuntu.info.in:75
+msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:76
+#: ../data/channels/Ubuntu.info.in:78
#, fuzzy
msgid "Community maintained (universe)"
msgstr "協力維護軟體 (Universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:77
-msgid "OpenSource software that is maintained by the community (universe)"
-msgstr ""
+#: ../data/channels/Ubuntu.info.in:79
+#, fuzzy
+msgid "Community maintained Open Source software"
+msgstr "協力維護軟體 (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:80
+#: ../data/channels/Ubuntu.info.in:82
#, fuzzy
msgid "Non-free drivers"
msgstr "非自由軟體 (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:81
-msgid "Proprietary drivers for devices (restricted) "
+#: ../data/channels/Ubuntu.info.in:83
+msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:84
+#: ../data/channels/Ubuntu.info.in:86
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "非自由軟體 (Multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:85
-msgid "Software that is restricted by copyright or legal issues (multiverse)"
+#: ../data/channels/Ubuntu.info.in:87
+msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:90
+#: ../data/channels/Ubuntu.info.in:92
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 ‘Dapper Drake‘"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:106
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 安全性更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:113
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:118
+#: ../data/channels/Ubuntu.info.in:120
#, fuzzy
msgid "Proposed updates"
msgstr "安裝更新套件(_I)"
#. Description
-#: ../data/channels/Ubuntu.info.in:125
+#: ../data/channels/Ubuntu.info.in:127
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:131
+#: ../data/channels/Ubuntu.info.in:134
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 ‘Breezy Badger’"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "官方支援"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:151
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 ‘Breezy Badger’"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:165
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 安全性更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:169
+#: ../data/channels/Ubuntu.info.in:172
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:176
+#: ../data/channels/Ubuntu.info.in:179
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 回移套件"
#. Description
-#: ../data/channels/Ubuntu.info.in:182
+#: ../data/channels/Ubuntu.info.in:186
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.10 ‘Breezy Badger’"
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:203
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:207
#, fuzzy
msgid "Oficially supported"
msgstr "官方支援"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:217
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 安全性更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:220
+#: ../data/channels/Ubuntu.info.in:224
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:227
+#: ../data/channels/Ubuntu.info.in:231
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 回移套件"
#. Description
-#: ../data/channels/Ubuntu.info.in:233
+#: ../data/channels/Ubuntu.info.in:237
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 ‘Breezy Badger’"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:242
+#: ../data/channels/Ubuntu.info.in:246
msgid "Community maintained (Universe)"
msgstr "協力維護軟體 (Universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:245
+#: ../data/channels/Ubuntu.info.in:249
msgid "Non-free (Multiverse)"
msgstr "非自由軟體 (Multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:254
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:258
#, fuzzy
msgid "No longer oficially supported"
msgstr "有些軟體不再有官方支援"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:261
msgid "Restricted copyright"
msgstr "版權受限制"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:268
#, fuzzy
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 5.10 安全性更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:271
+#: ../data/channels/Ubuntu.info.in:275
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 更新"
#. Description
-#: ../data/channels/Ubuntu.info.in:278
+#: ../data/channels/Ubuntu.info.in:282
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 回移套件"
diff --git a/tests/data/sources.list.testDistribution b/tests/data/sources.list.testDistribution
index 031e4c51..1687c504 100644
--- a/tests/data/sources.list.testDistribution
+++ b/tests/data/sources.list.testDistribution
@@ -6,4 +6,6 @@ deb http://de.archive.ubuntu.com/ubuntu/ edgy-updates restricted
deb http://de.archive.ubuntu.com/ubuntu/ edgy-security main
deb http://de.archive.ubuntu.com/ubuntu/ edgy-security multiverse
deb http://ftp.debian.org/debian sid main
-deb http://de.archive.ubuntu.com/ubuntu/ breezy main \ No newline at end of file
+deb ftp://ubuntu.cs.utah.edu/pub/ubuntu/ubuntu/ breezy main
+deb ftp://ubuntu.cs.utah.edu/pub/ubuntu/ubuntu/ breezy-backports main
+deb http://archive.ubuntu.com/ubuntu/ hoary main
diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py
index 1db99e3c..3ee106be 100644
--- a/tests/test_aptsources.py
+++ b/tests/test_aptsources.py
@@ -81,6 +81,15 @@ class TestAptSources(unittest.TestCase):
sources = aptsources.SourcesList()
distro = aptsources.Distribution()
distro.get_sources(sources)
+ # test if all suits of the current distro were detected correctly
+ dist_templates = set()
+ for s in sources:
+ if s.template:
+ dist_templates.add(s.template.name)
+ #print dist_templates
+ for d in ["edgy","edgy-security","edgy-updates","hoary","breezy", "breezy-backports"]:
+ self.assertTrue(d in dist_templates)
+ # test enable
comp = "restricted"
distro.enable_component(sources, comp)
found = {}
@@ -103,8 +112,8 @@ class TestAptSources(unittest.TestCase):
found = {}
for entry in sources:
if (entry.type == "deb" and
- entry.uri == "http://de.archive.ubuntu.com/ubuntu/" and
- "edgy" in entry.dist):
+ entry.template and
+ entry.template.name == "edgy"):
for c in entry.comps:
if c == comp:
if not found.has_key(entry.dist):